Commit 2948a2af authored by Marin Jankovski's avatar Marin Jankovski

Add membership_lock to allowed params. Change settings page warning.

parent c115d080
...@@ -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
...@@ -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
......
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