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
57ade484
Commit
57ade484
authored
Sep 04, 2018
by
J.D. Bean
Committed by
Rémy Coutable
Sep 04, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Feature/new merge breadcrumbs
parent
7ec468df
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
1 deletion
+25
-1
app/views/projects/merge_requests/creations/new.html.haml
app/views/projects/merge_requests/creations/new.html.haml
+2
-1
changelogs/unreleased/50452-breadcrumb-link-to-new-merge-requests.yml
...nreleased/50452-breadcrumb-link-to-new-merge-requests.yml
+5
-0
spec/features/merge_request/user_sees_breadcrumb_links_spec.rb
...features/merge_request/user_sees_breadcrumb_links_spec.rb
+18
-0
No files found.
app/views/projects/merge_requests/creations/new.html.haml
View file @
57ade484
-
breadcrumb_title
"Merge Requests"
-
add_to_breadcrumbs
"Merge Requests"
,
project_merge_requests_path
(
@project
)
-
breadcrumb_title
"New"
-
page_title
"New Merge Request"
-
page_title
"New Merge Request"
-
if
@merge_request
.
can_be_created
&&
!
params
[
:change_branches
]
-
if
@merge_request
.
can_be_created
&&
!
params
[
:change_branches
]
...
...
changelogs/unreleased/50452-breadcrumb-link-to-new-merge-requests.yml
0 → 100644
View file @
57ade484
---
title
:
"
Fix
breadcrumb
link
to
merge
requests
on
new
merge
request
page"
merge_request
:
21502
author
:
J.D. Bean
type
:
fixed
spec/features/merge_request/user_sees_breadcrumb_links_spec.rb
0 → 100644
View file @
57ade484
require
'rails_helper'
describe
'New merge request breadcrumbs'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
project
.
creator
}
before
do
sign_in
(
user
)
visit
project_new_merge_request_path
(
project
)
end
it
'display a link to project merge requests and new merge request pages'
do
page
.
within
'.breadcrumbs'
do
expect
(
find_link
(
'Merge Requests'
)[
:href
]).
to
end_with
(
project_merge_requests_path
(
project
))
expect
(
find_link
(
'New'
)[
:href
]).
to
end_with
(
project_new_merge_request_path
(
project
))
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