Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
59136d4a
Commit
59136d4a
authored
Feb 06, 2017
by
Filipa Lacerda
Committed by
Z.J. van de Weg
Feb 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds html and css to add mattermost team name to group in new and edit
parent
3a3d956a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
1 deletion
+37
-1
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+11
-1
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+20
-0
app/views/groups/new.html.haml
app/views/groups/new.html.haml
+6
-0
No files found.
app/assets/stylesheets/pages/groups.scss
View file @
59136d4a
...
@@ -74,8 +74,18 @@
...
@@ -74,8 +74,18 @@
}
}
}
}
.mattermost-icon
svg
{
.mattermost-icon
svg
{
width
:
16px
;
width
:
16px
;
height
:
16px
;
height
:
16px
;
vertical-align
:
text-bottom
;
vertical-align
:
text-bottom
;
}
}
.mattermost-team-name
{
color
:
$gl-text-color-secondary
;
}
.mattermost-info
{
display
:
block
;
color
:
$gl-text-color-secondary
;
margin-top
:
10px
;
}
app/views/groups/edit.html.haml
View file @
59136d4a
...
@@ -22,6 +22,26 @@
...
@@ -22,6 +22,26 @@
=
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
.form-group
=
f
.
label
:name
,
class:
'control-label'
do
%span
.mattermost-icon
=
custom_icon
(
'icon_mattermost'
)
Mattermost
.col-sm-10
.checkbox
=
f
.
label
:name
do
=
f
.
check_box
:name
,
checked:
true
Link the group to a new or existing Mattermost team
-
enabled
=
Gitlab
.
config
.
mattermost
.
enabled
-
if
enabled
.form-group
.col-sm-offset-2.col-sm-10
=
f
.
text_field
:name
,
placeholder:
"FILL WITH TEAM NAME"
,
class:
'form-control mattermost-team-name'
%span
.mattermost-info
Team URL: INSERT TEAM URL
.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
...
...
app/views/groups/new.html.haml
View file @
59136d4a
...
@@ -27,6 +27,12 @@
...
@@ -27,6 +27,12 @@
=
f
.
check_box
:chat_team
=
f
.
check_box
:chat_team
Link the group to a new or existing Mattermost team
Link the group to a new or existing Mattermost team
-
enabled
=
Gitlab
.
config
.
mattermost
.
enabled
-
if
enabled
.form-group
.col-sm-offset-2.col-sm-10
=
f
.
text_field
:name
,
placeholder:
'Mattermost team name'
,
class:
'form-control mattermost-team-name'
.form-group
.form-group
.col-sm-offset-2.col-sm-10
.col-sm-offset-2.col-sm-10
=
render
'shared/group_tips'
=
render
'shared/group_tips'
...
...
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