Merge branch 'fix-typo-in-application_settings-page' into 'master'

Fix typo in application settings page See merge request gitlab-org/gitlab-ce!18181

Merge branch 'fix-typo-in-application_settings-page' into 'master'
Fix typo in application settings page See merge request gitlab-org/gitlab-ce!18181
166b4575 · Robert Speicher · 88e3b8ec · e6d864e3 · 166b4575 · 166b4575
Commit 166b4575 authored Apr 04, 2018 by Robert Speicher
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 172 additions and 22 deletions

app/views/admin/application_settings/show.html.haml app/views/admin/application_settings/show.html.haml +1 -1

locale/gitlab.pot locale/gitlab.pot +171 -21

No files found.
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -76,7 +76,7 @@
    %button.btn.js-settings-toggle{ type: 'button' }
      = expanded ? 'Collapse' : 'Expand'
    %p
-      = _('Auto DevOps, runners amd job artifacts')
+      = _('Auto DevOps, runners and job artifacts')
  .settings-content
    = render 'ci_cd'


--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot