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
Jérome Perrin
gitlab-ce
Commits
39ecce05
Commit
39ecce05
authored
Apr 06, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build fix
parent
017ed4ae
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-0
spec/features/merge_requests/create_new_mr_spec.rb
spec/features/merge_requests/create_new_mr_spec.rb
+8
-3
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
39ecce05
...
...
@@ -257,3 +257,7 @@
width
:
auto
;
}
}
.merge-request-form
.select2-container
{
width
:
250px
!
important
;
}
spec/features/merge_requests/create_new_mr_spec.rb
View file @
39ecce05
require
'spec_helper'
feature
'Create New Merge Request'
,
feature:
true
,
js:
fals
e
do
feature
'Create New Merge Request'
,
feature:
true
,
js:
tru
e
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
...
...
@@ -13,9 +13,12 @@ feature 'Create New Merge Request', feature: true, js: false do
it
'generates a diff for an orphaned branch'
do
click_link
'New Merge Request'
select
"orphaned-branch"
,
from:
"merge_request_source_branch"
select
"master"
,
from:
"merge_request_target_branch"
first
(
'.js-source-branch'
).
click
first
(
'.dropdown-source-branch .dropdown-content a'
,
text:
'orphaned-branch'
).
click
click_button
"Compare branches"
click_link
"Changes"
expect
(
page
).
to
have_content
"README.md"
expect
(
page
).
to
have_content
"wm.png"
...
...
@@ -23,6 +26,8 @@ feature 'Create New Merge Request', feature: true, js: false do
fill_in
"merge_request_title"
,
with:
"Orphaned MR test"
click_button
"Submit merge request"
click_link
"Check out branch"
expect
(
page
).
to
have_content
'git checkout -b orphaned-branch origin/orphaned-branch'
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