diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-27 08:35:07 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-27 08:35:07 +0300 |
| commit | bf0b7927dbd2461241d8a7e8815ee4fdc432f848 (patch) | |
| tree | ef686ef6cfdb078c609d2d0df8afcce4041d9eac | |
| parent | aa77c5bd342a625c99eba8d0c1fb625b6811d412 (diff) | |
| parent | 32f4748598e407bb395b6999560d11ff3b95e75a (diff) | |
Merge branch 'gt-update-operations-settings-breadcrumb-trail' into 'master'
Update operations settings breadcrumb trail
Closes #56387
See merge request gitlab-org/gitlab-ce!25539
| -rw-r--r-- | app/views/projects/settings/operations/show.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/gt-update-operations-settings-breadcrumb-trail.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml index b36fa9a5f51..2822debe426 100644 --- a/app/views/projects/settings/operations/show.html.haml +++ b/app/views/projects/settings/operations/show.html.haml @@ -1,5 +1,6 @@ - @content_class = 'limit-container-width' unless fluid_layout -- page_title _('Operations') +- page_title _('Operations Settings') +- breadcrumb_title _('Operations Settings') = render 'projects/settings/operations/error_tracking', expanded: true = render_if_exists 'projects/settings/operations/tracing' diff --git a/changelogs/unreleased/gt-update-operations-settings-breadcrumb-trail.yml b/changelogs/unreleased/gt-update-operations-settings-breadcrumb-trail.yml new file mode 100644 index 00000000000..f7b10ea5c17 --- /dev/null +++ b/changelogs/unreleased/gt-update-operations-settings-breadcrumb-trail.yml @@ -0,0 +1,5 @@ +--- +title: Update operations settings breadcrumb trail +merge_request: 25539 +author: George Tsiolis +type: changed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 150e16ed67f..0d47deab951 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5227,6 +5227,9 @@ msgstr "" msgid "Operations Dashboard" msgstr "" +msgid "Operations Settings" +msgstr "" + msgid "Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab." msgstr "" |