summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorLanre Adelowo <adelowomailbox@gmail.com>2019-02-19 15:11:50 +0100
committertechknowlogick <matti@mdranta.net>2019-02-19 09:11:50 -0500
commit094263db4d9f1b53c4b4c021005eec07baddd253 (patch)
tree69d47554792a96e3dd13fdfd8c28cfb30ac462f8 /models
parentff2be17e3f2e4cf8e756796574cdd72d349fa19b (diff)
downloadgitea-094263db4d9f1b53c4b4c021005eec07baddd253.tar.gz
gitea-094263db4d9f1b53c4b4c021005eec07baddd253.zip
Show email if the authenticated user owns the profile page being requested for (#4981)
* Show email if the authenticated user owns the profile page being requested for. Also removed `setting.UI.ShowUserEmail` as it's documentation says it only controls the email setting on the explore page * fix current user check... This prevents a panic as a user must be signed in before ctx.User is called * fix panic in tests * try to fix tests * Update year * Test CI fail * Revert change * User 3 is not allowed to authorize * Set user2 email to be private * Change to user4 in explore page as user2 now has private email option set
Diffstat (limited to 'models')
-rw-r--r--models/fixtures/user.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml
index 3a44946bb2..8d2b698b20 100644
--- a/models/fixtures/user.yml
+++ b/models/fixtures/user.yml
@@ -21,6 +21,7 @@
name: user2
full_name: " < U<se>r Tw<o > >< "
email: user2@example.com
+ keep_email_private: true
passwd: 7d93daa0d1e6f2305cc8fa496847d61dc7320bb16262f9c55dd753480207234cdd96a93194e408341971742f4701772a025a # password
type: 0 # individual
salt: ZogKvWdyEx