diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-06 17:23:06 +0000 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-16 09:19:03 +0100 |
| commit | 59136d4ab6d13db74018ff301df31e70e45a3c27 (patch) | |
| tree | f00860022257b30d3a5bd6d8fd9b1a904abe1afa /app/views/groups | |
| parent | 3a3d956a8b6d031cc71963b14f5c70f78bef24a4 (diff) | |
| download | gitlab-ce-59136d4ab6d13db74018ff301df31e70e45a3c27.tar.gz | |
Adds html and css to add mattermost team name to group in new and edit
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/edit.html.haml | 20 | ||||
| -rw-r--r-- | app/views/groups/new.html.haml | 6 |
2 files changed, 26 insertions, 0 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 2706e8692d1..38d498f0343 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -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 diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 29b5d2ab032..3cc4f6d6e48 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -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' |