diff options
| author | Phil Hughes <me@iamphill.com> | 2018-06-01 16:41:31 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-06-01 16:41:31 +0000 |
| commit | abe98d44e8902a3f721c0f17cc20dc55bcb2d2f6 (patch) | |
| tree | 17db533158a99e0e25bbaacffeb2ea8cd2dec38a | |
| parent | c640e579249f914b7755378ba74cf1834c396d71 (diff) | |
| parent | e9a789d64d2ff045675ff91c91a3d806e553abfa (diff) | |
| download | gitlab-ce-abe98d44e8902a3f721c0f17cc20dc55bcb2d2f6.tar.gz | |
Merge branch 'new-label-spelling-error' into 'master'
Adds "the" to the new label page to correct the sentence.
See merge request gitlab-org/gitlab-ce!19316
| -rw-r--r-- | app/views/admin/labels/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/labels/_form.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/new-label-spelling-error.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index ee51b44e83e..7637471f9ae 100644 --- a/app/views/admin/labels/_form.html.haml +++ b/app/views/admin/labels/_form.html.haml @@ -19,7 +19,7 @@ .form-text.text-muted Choose any color. %br - Or you can choose one of suggested colors below + Or you can choose one of the suggested colors below .suggest-colors - suggested_colors.each do |color| diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml index f79f66b144f..2bf5efae1e6 100644 --- a/app/views/shared/labels/_form.html.haml +++ b/app/views/shared/labels/_form.html.haml @@ -19,7 +19,7 @@ .form-text.text-muted Choose any color. %br - Or you can choose one of suggested colors below + Or you can choose one of the suggested colors below .suggest-colors - suggested_colors.each do |color| diff --git a/changelogs/unreleased/new-label-spelling-error.yml b/changelogs/unreleased/new-label-spelling-error.yml new file mode 100644 index 00000000000..ad5f69688f3 --- /dev/null +++ b/changelogs/unreleased/new-label-spelling-error.yml @@ -0,0 +1,5 @@ +--- +title: Fixes a spelling error on the new label page +merge_request: 19316 +author: samdbeckham +type: fixed |