Adjust merge request & note policies for EE

ee/app/policies/ee/project_policy.rb

@@ -58,7 +58,8 @@ module EE
 
       rule { license_block }.policy do
         prevent :create_issue
-        prevent :create_merge_request
+        prevent :create_merge_request_in
+        prevent :create_merge_request_from
         prevent :push_code
       end
 

ee/app/policies/epic_policy.rb

@@ -10,8 +10,5 @@ class EpicPolicy < BasePolicy
     enable :create_note
   end
 
-  rule { can?(:admin_epic) }.policy do
-    enable :update_note
-    enable :admin_note
-  end
+  rule { can?(:create_note) }.enable :award_emoji
 end

spec/policies/project_policy_spec.rb

@@ -401,6 +401,7 @@ describe ProjectPolicy do
         read_project_snippet read_project_member read_note read_cycle_analytics
         read_pipeline read_build read_commit_status read_container_image
         read_environment read_deployment read_merge_request read_pages
+        create_merge_request_in award_emoji
       ]
     end