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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
202bf71d
Commit
202bf71d
authored
Feb 10, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change MR link to "View Open Merge Request"
parent
1353cff5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+1
-1
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+1
-1
features/steps/project/commits/commits.rb
features/steps/project/commits/commits.rb
+1
-1
No files found.
app/views/projects/commits/show.html.haml
View file @
202bf71d
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
.block-controls.hidden-xs.hidden-sm
.block-controls.hidden-xs.hidden-sm
-
if
@merge_request
.
present?
-
if
@merge_request
.
present?
.control
.control
=
link_to
"View
#{
@merge_request
.
to_reference
}
"
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn btn-success
'
=
link_to
"View
Open Merge Request"
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'btn
'
-
elsif
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
-
elsif
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
.control
.control
=
link_to
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
do
=
link_to
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
do
...
...
app/views/projects/compare/_form.html.haml
View file @
202bf71d
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
=
button_tag
"Compare"
,
class:
"btn btn-create commits-compare-btn"
=
button_tag
"Compare"
,
class:
"btn btn-create commits-compare-btn"
-
if
@merge_request
.
present?
-
if
@merge_request
.
present?
=
link_to
"View
#{
@merge_request
.
to_reference
}
"
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'prepend-left-10 btn'
=
link_to
"View
Open Merge Request
"
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
'prepend-left-10 btn'
-
elsif
create_mr_button?
-
elsif
create_mr_button?
=
link_to
create_mr_path
,
class:
'prepend-left-10 btn'
do
=
link_to
create_mr_path
,
class:
'prepend-left-10 btn'
do
=
icon
(
"plus"
)
=
icon
(
"plus"
)
...
...
features/steps/project/commits/commits.rb
View file @
202bf71d
...
@@ -110,7 +110,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
...
@@ -110,7 +110,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
step
'I should see button to the merge request'
do
step
'I should see button to the merge request'
do
merge_request
=
MergeRequest
.
find_by
(
title:
'Feature'
)
merge_request
=
MergeRequest
.
find_by
(
title:
'Feature'
)
expect
(
page
).
to
have_link
"View
#{
merge_request
.
to_reference
}
"
,
href:
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
merge_request
)
expect
(
page
).
to
have_link
"View
Open Merge Request
"
,
href:
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
merge_request
)
end
end
step
'I see breadcrumb links'
do
step
'I see breadcrumb links'
do
...
...
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