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
86bf684f
Commit
86bf684f
authored
May 08, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor UI improvements and fixed test
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
2da289cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+3
-3
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+2
-1
No files found.
app/views/projects/merge_requests/_new_compare.html.haml
View file @
86bf684f
%h3
.page-title
Compare
changes for new merge r
equest
%h3
.page-title
Compare
branches for new Merge R
equest
%hr
%hr
=
form_for
[
@project
,
@merge_request
],
url:
new_project_merge_request_path
(
@project
),
method: :get
,
html:
{
class:
"merge-request-form form-inline"
}
do
|
f
|
=
form_for
[
@project
,
@merge_request
],
url:
new_project_merge_request_path
(
@project
),
method: :get
,
html:
{
class:
"merge-request-form form-inline"
}
do
|
f
|
...
@@ -45,8 +45,8 @@
...
@@ -45,8 +45,8 @@
%span
.label-branch
#{
@merge_request
.
target_branch
}
%span
.label-branch
#{
@merge_request
.
target_branch
}
are the same.
are the same.
.form-actions
%hr
=
f
.
submit
'Compare branches'
,
class:
"btn btn-primary"
=
f
.
submit
'Compare branches'
,
class:
"btn btn-primary"
:javascript
:javascript
var
source_branch
=
$
(
"
#merge_request_source_branch
"
)
var
source_branch
=
$
(
"
#merge_request_source_branch
"
)
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
86bf684f
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_branch
=
f
.
hidden_field
:target_branch
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:source_branch
=
f
.
submit
'Submit
a
merge request'
,
class:
"btn btn-create"
=
f
.
submit
'Submit merge request'
,
class:
"btn btn-create"
.mr-compare
.mr-compare
%div
.ui-box
%div
.ui-box
...
...
features/steps/project/merge_requests.rb
View file @
86bf684f
...
@@ -61,9 +61,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -61,9 +61,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I submit new merge request "Wiki Feature"'
do
step
'I submit new merge request "Wiki Feature"'
do
fill_in
"merge_request_title"
,
with:
"Wiki Feature"
select
"master"
,
from:
"merge_request_source_branch"
select
"master"
,
from:
"merge_request_source_branch"
select
"notes_refactoring"
,
from:
"merge_request_target_branch"
select
"notes_refactoring"
,
from:
"merge_request_target_branch"
click_button
"Compare branches"
fill_in
"merge_request_title"
,
with:
"Wiki Feature"
click_button
"Submit merge request"
click_button
"Submit merge request"
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