Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e86e87fa
Commit
e86e87fa
authored
Sep 26, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9669 from aaronsnyder/admin-labels-grammar
Fix grammar in admin area labels when no labels exist
parents
e2016ba3
a9cfa6c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
CHANGELOG
CHANGELOG
+1
-0
app/views/admin/labels/index.html.haml
app/views/admin/labels/index.html.haml
+2
-2
features/steps/admin/labels.rb
features/steps/admin/labels.rb
+1
-1
No files found.
CHANGELOG
View file @
e86e87fa
...
@@ -12,6 +12,7 @@ v 8.1.0 (unreleased)
...
@@ -12,6 +12,7 @@ v 8.1.0 (unreleased)
- Show CI status on Your projects page and Starred projects page
- Show CI status on Your projects page and Starred projects page
- Remove "Continuous Integration" page from dashboard
- Remove "Continuous Integration" page from dashboard
- Add notes and SSL verification entries to hook APIs (Ben Boeckel)
- 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)
v 8.0.3 (unreleased)
...
...
app/views/admin/labels/index.html.haml
View file @
e86e87fa
...
@@ -12,5 +12,5 @@
...
@@ -12,5 +12,5 @@
=
paginate
@labels
,
theme:
'gitlab'
=
paginate
@labels
,
theme:
'gitlab'
-
else
-
else
.light-well
.light-well
.nothing-here-block
There are no any labels yet
.nothing-here-block
There are no labels yet
\ No newline at end of file
features/steps/admin/labels.rb
View file @
e86e87fa
...
@@ -38,7 +38,7 @@ class Spinach::Features::AdminIssuesLabels < Spinach::FeatureSteps
...
@@ -38,7 +38,7 @@ class Spinach::Features::AdminIssuesLabels < Spinach::FeatureSteps
step
'I should see labels help message'
do
step
'I should see labels help message'
do
page
.
within
'.labels'
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
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment