diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-11 14:38:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-11 14:38:27 +0000 |
| commit | a3521bcb4348b589222bb7b42e51a28cbbc754eb (patch) | |
| tree | b81dac1999cf84e2e1ee5c5c02c5a6a81456e3e1 | |
| parent | 8d067414f5112be1a8e927ba06fad0abc989038f (diff) | |
| parent | 4e2781febd1564febe6968d902c56a74c45c6bf7 (diff) | |
| download | gitlab-ce-a3521bcb4348b589222bb7b42e51a28cbbc754eb.tar.gz | |
Merge branch 'expose-group-id-on-home-panel' into 'master'
expose group id on home panel
Closes #58677
See merge request gitlab-org/gitlab-ce!25897
| -rw-r--r-- | app/views/groups/_home_panel.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/expose-group-id-on-home-panel.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 | ||||
| -rw-r--r-- | spec/views/groups/_home_panel.html.haml_spec.rb | 15 |
4 files changed, 24 insertions, 1 deletions
diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml index 39c0c113793..dbd01c3c61a 100644 --- a/app/views/groups/_home_panel.html.haml +++ b/app/views/groups/_home_panel.html.haml @@ -13,7 +13,7 @@ = visibility_level_icon(@group.visibility_level, fw: false, options: {class: 'icon'}) .home-panel-metadata.d-flex.align-items-center.text-secondary %span - = _("Group") + = _("Group ID: %{group_id}") % { group_id: @group.id } - if current_user %span.access-request-links.prepend-left-8 = render 'shared/members/access_request_links', source: @group diff --git a/changelogs/unreleased/expose-group-id-on-home-panel.yml b/changelogs/unreleased/expose-group-id-on-home-panel.yml new file mode 100644 index 00000000000..1efe15a6e1a --- /dev/null +++ b/changelogs/unreleased/expose-group-id-on-home-panel.yml @@ -0,0 +1,5 @@ +--- +title: Expose group id on home panel +merge_request: 25897 +author: Peter Marko +type: added diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 006ec1ec56f..df69e86c1ad 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3789,6 +3789,9 @@ msgstr "" msgid "Group ID" msgstr "" +msgid "Group ID: %{group_id}" +msgstr "" + msgid "Group Runners" msgstr "" diff --git a/spec/views/groups/_home_panel.html.haml_spec.rb b/spec/views/groups/_home_panel.html.haml_spec.rb new file mode 100644 index 00000000000..91c5ca261b9 --- /dev/null +++ b/spec/views/groups/_home_panel.html.haml_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +describe 'groups/_home_panel' do + let(:group) { create(:group) } + + before do + assign(:group, group) + end + + it 'renders the group ID' do + render + + expect(rendered).to have_content("Group ID: #{group.id}") + end +end |