diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-04 22:25:42 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-04-04 22:25:42 +0300 |
| commit | 166b4575a6353668c894fea0ba234d0b371dee03 (patch) | |
| tree | 16a8df0387b60a41f4ef3cf5f8c56d68e6b0ec8a /app/views/admin/application_settings | |
| parent | 88e3b8ec271d9624371ee71eb16e7476f00c9bc3 (diff) | |
| parent | e6d864e34475d38ce3af7cec5576df3ca5bba6d3 (diff) | |
Merge branch 'fix-typo-in-application_settings-page' into 'master'
Fix typo in application settings page
See merge request gitlab-org/gitlab-ce!18181
Diffstat (limited to 'app/views/admin/application_settings')
| -rw-r--r-- | app/views/admin/application_settings/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index 9e605054523..caaa93aa1e2 100644 --- 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' |