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
c2ad90aa
Commit
c2ad90aa
authored
Apr 18, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'pluralize-ee-boards' into 'master'
Pluralize ee boards Closes #1976 See merge request !1630
parents
69fd23f8
3e23a450
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
app/views/projects/issues/_head.html.haml
app/views/projects/issues/_head.html.haml
+3
-2
spec/features/issues/sub_nav_ee.rb
spec/features/issues/sub_nav_ee.rb
+17
-0
No files found.
app/views/projects/issues/_head.html.haml
View file @
c2ad90aa
...
...
@@ -10,9 +10,10 @@
List
=
nav_link
(
controller: :boards
)
do
=
link_to
namespace_project_boards_path
(
@project
.
namespace
,
@project
),
title:
'Board'
do
-# EE should use plural "Boards"
=
link_to
namespace_project_boards_path
(
@project
.
namespace
,
@project
),
title:
'Boards'
do
%span
Board
Board
s
-
if
project_nav_tab?
(
:merge_requests
)
&&
current_controller?
(
:merge_requests
)
=
nav_link
(
controller: :merge_requests
)
do
...
...
spec/features/issues/sub_nav_ee.rb
0 → 100644
View file @
c2ad90aa
require
'spec_helper'
describe
'Issues sub nav EE'
,
:feature
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
before
do
project
.
add_master
(
user
)
login_as
(
user
)
visit
namespace_project_issues_path
(
project
.
namespace
,
project
)
end
it
'should have a `Boards` item'
do
expect
(
find
(
'.sub-nav'
)).
to
have_content
'Boards'
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