diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-25 10:29:44 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-25 10:29:44 +0000 |
| commit | d2e205046aa2695730cf425d848c570b908e3940 (patch) | |
| tree | f707e74643849c0ac02c7a817fe450732e867db3 | |
| parent | fd532302ecb04159ce1299f1b312fe622147849c (diff) | |
| parent | 5e768299cb5e81e0f7f0cdc4defdb42f16a0875e (diff) | |
| download | gitlab-ce-d2e205046aa2695730cf425d848c570b908e3940.tar.gz | |
Merge branch 'show-group-id-in-group-settings' into 'master'
Show group id in group settings
Closes #45516
See merge request gitlab-org/gitlab-ce!18482
| -rw-r--r-- | app/views/groups/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_group_form.html.haml | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/show-group-id-in-group-settings.yml | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 86cd0759a2c..3375e01b3a1 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -1,4 +1,6 @@ - breadcrumb_title "General Settings" +- @content_class = "limit-container-width" unless fluid_layout + .panel.panel-default.prepend-top-default .panel-heading Group settings diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml index cb21f90696f..403d22c79f8 100644 --- a/app/views/shared/_group_form.html.haml +++ b/app/views/shared/_group_form.html.haml @@ -32,6 +32,13 @@ required: true, title: 'You can choose a descriptive name different from the path.' +- if @group.persisted? + .form-group.group-name-holder + = f.label :id, class: 'control-label' do + = _("Group ID") + .col-sm-10 + = f.text_field :id, class: 'form-control', readonly: true + .form-group.group-description-holder = f.label :description, class: 'control-label' .col-sm-10 diff --git a/changelogs/unreleased/show-group-id-in-group-settings.yml b/changelogs/unreleased/show-group-id-in-group-settings.yml new file mode 100644 index 00000000000..b975fe8c71d --- /dev/null +++ b/changelogs/unreleased/show-group-id-in-group-settings.yml @@ -0,0 +1,5 @@ +--- +title: Show group id in group settings +merge_request: 18482 +author: George Tsiolis +type: added |