From 2948a2afbc00f067f2983bb06ec01780c4b17f0e Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 15 Dec 2014 10:32:53 +0100 Subject: [PATCH] Add membership_lock to allowed params. Change settings page warning. --- app/controllers/groups_controller.rb | 2 +- app/views/projects/team_members/index.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index df298ee1e5..8251ee9240 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -163,6 +163,6 @@ class GroupsController < ApplicationController end def group_params - params.require(:group).permit(:name, :description, :path, :avatar) + params.require(:group).permit(:name, :description, :path, :avatar, :membership_lock) end end diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml index 8a5641a022..52ab9f58ed 100644 --- a/app/views/projects/team_members/index.html.haml +++ b/app/views/projects/team_members/index.html.haml @@ -15,7 +15,7 @@ %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink" - if membership_locked? %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 - if @group