BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f6247600
Unverified
Commit
f6247600
authored
Feb 28, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Review changes
parent
9f0e23d6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+4
-2
base_service.rb
app/services/groups/base_service.rb
+1
-1
_create_chat_team.html.haml
app/views/groups/_create_chat_team.html.haml
+1
-1
edit.html.haml
app/views/groups/edit.html.haml
+0
-2
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
f6247600
...
@@ -215,11 +215,13 @@ const ShortcutsBlob = require('./shortcuts_blob');
...
@@ -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();
...
...
app/services/groups/base_service.rb
View file @
f6247600
...
@@ -9,7 +9,7 @@ module Groups
...
@@ -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
app/views/groups/_create_chat_team.html.haml
View file @
f6247600
...
@@ -6,7 +6,7 @@
...
@@ -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
...
...
app/views/groups/edit.html.haml
View file @
f6247600
...
@@ -22,8 +22,6 @@
...
@@ -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
...
...
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