Conflicts: app/policies/merge_request_policy.rb

e74d8994 · Bob Van Landuyt · a42e55e2 · e74d8994
Commit e74d8994 authored Feb 23, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/policies/merge_request_policy.rb app/policies/merge_request_policy.rb +0 -3

No files found.
--- a/app/policies/merge_request_policy.rb
+++ b/app/policies/merge_request_policy.rb
 class MergeRequestPolicy < IssuablePolicy
-<<<<<<< HEAD
  prepend EE::MergeRequestPolicy

-=======
->>>>>>> upstream/master
  rule { can?(:read_merge_request) | visible_to_user }.enable :read_merge_request_iid
 end