Review changes
This commit is contained in:
parent
9f0e23d609
commit
f6247600a3
|
|
@ -215,11 +215,13 @@ const ShortcutsBlob = require('./shortcuts_blob');
|
|||
new UsersSelect();
|
||||
break;
|
||||
case 'groups:new':
|
||||
case 'admin:groups:new':
|
||||
gl.BindInOut.initAll();
|
||||
case 'groups:new':
|
||||
case 'admin:groups:new':
|
||||
case 'groups:edit':
|
||||
case 'admin:groups:edit':
|
||||
case 'admin:groups:new':
|
||||
new GroupAvatar();
|
||||
gl.BindInOut.initAll();
|
||||
break;
|
||||
case 'projects:tree:show':
|
||||
shortcut_handler = new ShortcutsNavigation();
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ module Groups
|
|||
private
|
||||
|
||||
def create_chat_team?
|
||||
@chat_team == "true" && Gitlab.config.mattermost.enabled
|
||||
@chat_team == true && Gitlab.config.mattermost.enabled
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
.col-sm-10
|
||||
.checkbox.js-toggle-container
|
||||
= f.label :create_chat_team do
|
||||
.js-toggle-button= f.check_box(:create_chat_team, { checked: true }, 'true', 'false')
|
||||
.js-toggle-button= f.check_box(:create_chat_team, { checked: true }, true, false)
|
||||
Create a Mattermost team for this group
|
||||
%br
|
||||
%small.light.js-toggle-content
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@
|
|||
|
||||
= render 'shared/visibility_level', f: f, visibility_level: @group.visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group
|
||||
|
||||
= render 'create_chat_team', f: f if Gitlab.config.mattermost.enabled
|
||||
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
= render 'shared/allow_request_access', form: f
|
||||
|
|
|
|||
Loading…
Reference in New Issue