diff options
author | Stan Hu <stanhu@gmail.com> | 2015-09-27 02:15:47 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-09-27 02:15:47 +0300 |
commit | e86e87fa7175b3ac0ef9df0ed10039a410ebc5d1 (patch) | |
tree | 7cf6254d6ab6fbd0277d2731dfff629d5db39df8 | |
parent | e2016ba367563a9605c1f3528a4f1c540300afa1 (diff) | |
parent | a9cfa6c50819a959db9f62efe57803f667c92967 (diff) |
Merge pull request #9669 from aaronsnyder/admin-labels-grammar
Fix grammar in admin area labels when no labels exist
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/admin/labels/index.html.haml | 4 | ||||
-rw-r--r-- | features/steps/admin/labels.rb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index b495ccc9b9e..8308b693219 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.1.0 (unreleased) - Show CI status on Your projects page and Starred projects page - Remove "Continuous Integration" page from dashboard - Add notes and SSL verification entries to hook APIs (Ben Boeckel) + - Fix grammar in admin area "labels" .nothing-here-block when no labels exist. v 8.0.3 (unreleased) diff --git a/app/views/admin/labels/index.html.haml b/app/views/admin/labels/index.html.haml index 8b11c28c56e..d67454c03e7 100644 --- a/app/views/admin/labels/index.html.haml +++ b/app/views/admin/labels/index.html.haml @@ -12,5 +12,5 @@ = paginate @labels, theme: 'gitlab' - else .light-well - .nothing-here-block There are no any labels yet -
\ No newline at end of file + .nothing-here-block There are no labels yet + diff --git a/features/steps/admin/labels.rb b/features/steps/admin/labels.rb index d64380abf73..b45d98658bc 100644 --- a/features/steps/admin/labels.rb +++ b/features/steps/admin/labels.rb @@ -38,7 +38,7 @@ class Spinach::Features::AdminIssuesLabels < Spinach::FeatureSteps step 'I should see labels help message' do page.within '.labels' do - expect(page).to have_content 'There are no any labels yet' + expect(page).to have_content 'There are no labels yet' end end |