Skip to content

G
gitlab-ce
Commit ffccc4e8 authored by Robert Speicher's avatar Robert Speicher
Browse files
Options

Resolve app/models/concerns/protected_ref_access.rb

parent 9fdb7498
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/concerns/protected_ref_access.rb
View file @ ffccc4e8
...@@ -2,11 +2,8 @@ ...@@ -2,11 +2,8 @@
module ProtectedRefAccess module ProtectedRefAccess
extend ActiveSupport::Concern extend ActiveSupport::Concern
<<<<<<< HEAD
include EE::ProtectedRefAccess::Scopes include EE::ProtectedRefAccess::Scopes
prepend EE::ProtectedRefAccess prepend EE::ProtectedRefAccess
=======
>>>>>>> upstream/master
HUMAN_ACCESS_LEVELS = { HUMAN_ACCESS_LEVELS = {
Gitlab::Access::MAINTAINER => "Maintainers".freeze, Gitlab::Access::MAINTAINER => "Maintainers".freeze,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7