Skip to content
Snippets Groups Projects
Verified Commit f6247600 authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett
Browse files

Review changes

parent 9f0e23d6
No related branches found
No related tags found
No related merge requests found
Loading
@@ -215,11 +215,13 @@ const ShortcutsBlob = require('./shortcuts_blob');
Loading
@@ -215,11 +215,13 @@ const ShortcutsBlob = require('./shortcuts_blob');
new UsersSelect(); new UsersSelect();
break; break;
case 'groups:new': case 'groups:new':
case 'admin:groups:new':
gl.BindInOut.initAll();
case 'groups:new':
case 'admin:groups:new':
case 'groups:edit': case 'groups:edit':
case 'admin:groups:edit': case 'admin:groups:edit':
case 'admin:groups:new':
new GroupAvatar(); new GroupAvatar();
gl.BindInOut.initAll();
break; break;
case 'projects:tree:show': case 'projects:tree:show':
shortcut_handler = new ShortcutsNavigation(); shortcut_handler = new ShortcutsNavigation();
Loading
Loading
Loading
@@ -9,7 +9,7 @@ module Groups
Loading
@@ -9,7 +9,7 @@ module Groups
private private
   
def create_chat_team? def create_chat_team?
@chat_team == "true" && Gitlab.config.mattermost.enabled @chat_team == true && Gitlab.config.mattermost.enabled
end end
end end
end end
Loading
@@ -6,7 +6,7 @@
Loading
@@ -6,7 +6,7 @@
.col-sm-10 .col-sm-10
.checkbox.js-toggle-container .checkbox.js-toggle-container
= f.label :create_chat_team do = 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 Create a Mattermost team for this group
%br %br
%small.light.js-toggle-content %small.light.js-toggle-content
Loading
Loading
Loading
@@ -22,8 +22,6 @@
Loading
@@ -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 '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 .form-group
.col-sm-offset-2.col-sm-10 .col-sm-offset-2.col-sm-10
= render 'shared/allow_request_access', form: f = render 'shared/allow_request_access', form: f
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment