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
7a65cb3a
Commit
7a65cb3a
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't reset target branch when choosing to "Change branches" in MR
parent
e3233016
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/helpers/merge_requests_helper.rb
app/helpers/merge_requests_helper.rb
+3
-2
app/views/projects/merge_requests/new.html.haml
app/views/projects/merge_requests/new.html.haml
+1
-1
features/steps/project/forked_merge_requests.rb
features/steps/project/forked_merge_requests.rb
+0
-1
No files found.
app/helpers/merge_requests_helper.rb
View file @
7a65cb3a
...
@@ -49,8 +49,9 @@ module MergeRequestsHelper
...
@@ -49,8 +49,9 @@ module MergeRequestsHelper
source_project_id:
@merge_request
.
source_project_id
,
source_project_id:
@merge_request
.
source_project_id
,
target_project_id:
@merge_request
.
target_project_id
,
target_project_id:
@merge_request
.
target_project_id
,
source_branch:
@merge_request
.
source_branch
,
source_branch:
@merge_request
.
source_branch
,
target_branch:
nil
target_branch:
@merge_request
.
target_branch
,
}
},
change_branches:
true
)
)
end
end
...
...
app/views/projects/merge_requests/new.html.haml
View file @
7a65cb3a
-
page_title
"New Merge Request"
-
page_title
"New Merge Request"
=
render
"header_title"
=
render
"header_title"
-
if
@merge_request
.
can_be_created
-
if
@merge_request
.
can_be_created
&&
!
params
[
:change_branches
]
=
render
'new_submit'
=
render
'new_submit'
-
else
-
else
=
render
'new_compare'
=
render
'new_compare'
features/steps/project/forked_merge_requests.rb
View file @
7a65cb3a
...
@@ -112,7 +112,6 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
...
@@ -112,7 +112,6 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
end
step
'I fill out an invalid "Merge Request On Forked Project" merge request'
do
step
'I fill out an invalid "Merge Request On Forked Project" merge request'
do
select
"Select branch"
,
from:
"merge_request_target_branch"
expect
(
find
(
:select
,
"merge_request_source_project_id"
,
{}).
value
).
to
eq
@forked_project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_source_project_id"
,
{}).
value
).
to
eq
@forked_project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_target_project_id"
,
{}).
value
).
to
eq
@project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_target_project_id"
,
{}).
value
).
to
eq
@project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_source_branch"
,
{}).
value
).
to
eq
""
expect
(
find
(
:select
,
"merge_request_source_branch"
,
{}).
value
).
to
eq
""
...
...
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