Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/app/policies/achievements/user_achievement_policy.rb b/app/policies/achievements/user_achievement_policy.rb
index 05650a05490..2710c9c0a5b 100644
--- a/app/policies/achievements/user_achievement_policy.rb
+++ b/app/policies/achievements/user_achievement_policy.rb
@@ -5,8 +5,17 @@ module Achievements
     delegate { @subject.achievement.namespace }
     delegate { @subject.user }
 
+    condition(:user_is_owner) { @subject.user == @user }
+
     rule { can?(:read_user_profile) | can?(:admin_achievement) }.enable :read_user_achievement
 
-    rule { ~can?(:read_achievement) }.prevent :read_user_achievement
+    rule { user_is_owner }.enable :update_owned_user_achievement
+
+    rule { can?(:update_owned_user_achievement) }.enable :update_user_achievement
+
+    rule { ~can?(:read_achievement) }.policy do
+      prevent :read_user_achievement
+      prevent :update_user_achievement
+    end
   end
 end