summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Snyder <=>2015-09-25 21:14:16 -0700
committerAaron Snyder <=>2015-09-26 11:25:26 -0700
commita9cfa6c50819a959db9f62efe57803f667c92967 (patch)
tree6418213c73c2b0a8078a23e6d5338f1ef10bc513
parentb623391720e2687ca88c6bf1166ee571d85807fa (diff)
downloadgitlab-ce-a9cfa6c50819a959db9f62efe57803f667c92967.tar.gz
Fix grammar in admin area labels .nothing-here-block when no labels exist.
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/admin/labels/index.html.haml4
-rw-r--r--features/steps/admin/labels.rb2
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8ff61cd6e9f..9ea016e7cc2 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.2 (unreleased)
- Fix default avatar not rendering in network graph (Stan Hu)
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