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
85b19d69
Commit
85b19d69
authored
Feb 06, 2017
by
Filipa Lacerda
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
67620153
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
1 deletion
+37
-1
groups.scss
app/assets/stylesheets/pages/groups.scss
+11
-1
edit.html.haml
app/views/groups/edit.html.haml
+20
-0
new.html.haml
app/views/groups/new.html.haml
+6
-0
No files found.
app/assets/stylesheets/pages/groups.scss
View file @
85b19d69
...
...
@@ -74,8 +74,18 @@
}
}
.mattermost-icon
svg
{
.mattermost-icon
svg
{
width
:
16px
;
height
:
16px
;
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 @
85b19d69
...
...
@@ -23,6 +23,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
.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
.col-sm-offset-2.col-sm-10
=
render
'shared/allow_request_access'
,
form:
f
...
...
app/views/groups/new.html.haml
View file @
85b19d69
...
...
@@ -27,6 +27,12 @@
=
f
.
check_box
:chat_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
.col-sm-offset-2.col-sm-10
=
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