Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e07b99df
Commit
e07b99df
authored
Dec 17, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce diff with CE in ProtectedRefsController
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
c531b2ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletion
+19
-1
app/controllers/projects/protected_refs_controller.rb
app/controllers/projects/protected_refs_controller.rb
+3
-1
ee/app/controllers/ee/projects/protected_refs_controller.rb
ee/app/controllers/ee/projects/protected_refs_controller.rb
+16
-0
No files found.
app/controllers/projects/protected_refs_controller.rb
View file @
e07b99df
...
@@ -62,6 +62,8 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
...
@@ -62,6 +62,8 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
end
end
def
access_level_attributes
def
access_level_attributes
%i
(access_level id user_id _destroy group_id)
%i
[access_level id]
end
end
end
end
Projects
::
ProtectedRefsController
.
prepend
(
::
EE
::
Projects
::
ProtectedRefsController
)
ee/app/controllers/ee/projects/protected_refs_controller.rb
0 → 100644
View file @
e07b99df
# frozen_string_literal: true
module
EE
module
Projects
module
ProtectedRefsController
extend
::
Gitlab
::
Utils
::
Override
protected
override
:access_level_attributes
def
access_level_attributes
super
+
%i[user_id _destroy group_id]
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment