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
2948a2af
Commit
2948a2af
authored
Dec 15, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add membership_lock to allowed params. Change settings page warning.
parent
c115d080
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
app/views/projects/team_members/index.html.haml
app/views/projects/team_members/index.html.haml
+1
-1
No files found.
app/controllers/groups_controller.rb
View file @
2948a2af
...
@@ -163,6 +163,6 @@ class GroupsController < ApplicationController
...
@@ -163,6 +163,6 @@ class GroupsController < ApplicationController
end
end
def
group_params
def
group_params
params
.
require
(
:group
).
permit
(
:name
,
:description
,
:path
,
:avatar
)
params
.
require
(
:group
).
permit
(
:name
,
:description
,
:path
,
:avatar
,
:membership_lock
)
end
end
end
end
app/views/projects/team_members/index.html.haml
View file @
2948a2af
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
%strong
=
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
%strong
=
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
-
if
membership_locked?
-
if
membership_locked?
%span
.pull-right
%span
.pull-right
Adding new user to membership is disabled by a group setting
Managing user access is disabled at group level
=
render
"team"
,
members:
@project_members
=
render
"team"
,
members:
@project_members
-
if
@group
-
if
@group
...
...
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