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
Tatuya Kamada
gitlab-ce
Commits
0adc2689
Commit
0adc2689
authored
Jan 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
a023daaa
b72f22ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/services/merge_requests/build_service.rb
app/services/merge_requests/build_service.rb
+2
-2
No files found.
app/services/merge_requests/build_service.rb
View file @
0adc2689
...
@@ -13,7 +13,7 @@ module MergeRequests
...
@@ -13,7 +13,7 @@ module MergeRequests
merge_request
.
target_branch
||=
merge_request
.
target_project
.
default_branch
merge_request
.
target_branch
||=
merge_request
.
target_project
.
default_branch
unless
merge_request
.
target_branch
&&
merge_request
.
source_branch
unless
merge_request
.
target_branch
&&
merge_request
.
source_branch
return
build_failed
(
merge_request
,
"You must select source and target branches"
)
return
build_failed
(
merge_request
,
nil
)
end
end
# Generate suggested MR title based on source branch name
# Generate suggested MR title based on source branch name
...
@@ -59,7 +59,7 @@ module MergeRequests
...
@@ -59,7 +59,7 @@ module MergeRequests
end
end
def
build_failed
(
merge_request
,
message
)
def
build_failed
(
merge_request
,
message
)
merge_request
.
errors
.
add
(
:base
,
message
)
merge_request
.
errors
.
add
(
:base
,
message
)
unless
message
.
nil?
merge_request
.
compare_commits
=
[]
merge_request
.
compare_commits
=
[]
merge_request
.
can_be_created
=
false
merge_request
.
can_be_created
=
false
merge_request
merge_request
...
...
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