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
03e517e0
Commit
03e517e0
authored
Dec 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/mr_duplicate_iids' of /home/git/repositories/gitlab/gitlabhq
parents
7bb2a536
8c5aa5e3
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
101 additions
and
26 deletions
+101
-26
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+22
-4
app/helpers/merge_requests_helper.rb
app/helpers/merge_requests_helper.rb
+1
-1
app/models/merge_request.rb
app/models/merge_request.rb
+34
-2
app/models/project.rb
app/models/project.rb
+7
-3
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+4
-1
app/views/projects/merge_requests/invalid.html.haml
app/views/projects/merge_requests/invalid.html.haml
+15
-9
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+2
-2
app/views/projects/merge_requests/show/_no_accept.html.haml
app/views/projects/merge_requests/show/_no_accept.html.haml
+12
-0
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
03e517e0
...
@@ -79,6 +79,21 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -79,6 +79,21 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
def
update
def
update
# If we close MergeRequest we want to ignore validation
# so we can close broken one (Ex. fork project removed)
if
params
[
:merge_request
]
==
{
"state_event"
=>
"close"
}
@merge_request
.
allow_broken
=
true
if
@merge_request
.
close
opts
=
{
notice:
'Merge request was successfully closed.'
}
else
opts
=
{
alert:
'Failed to close merge request.'
}
end
redirect_to
[
@merge_request
.
target_project
,
@merge_request
],
opts
return
end
if
@merge_request
.
update_attributes
(
params
[
:merge_request
].
merge
(
author_id_of_changes:
current_user
.
id
))
if
@merge_request
.
update_attributes
(
params
[
:merge_request
].
merge
(
author_id_of_changes:
current_user
.
id
))
@merge_request
.
reload_code
@merge_request
.
reload_code
@merge_request
.
mark_as_unchecked
@merge_request
.
mark_as_unchecked
...
@@ -160,14 +175,17 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -160,14 +175,17 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
def
validates_merge_request
def
validates_merge_request
# If source project was removed (Ex. mr from fork to origin)
return
invalid_mr
unless
@merge_request
.
source_project
# Show git not found page
# Show git not found page
# if there is no saved commits between source & target branch
# if there is no saved commits between source & target branch
if
@merge_request
.
commits
.
blank?
if
@merge_request
.
commits
.
blank?
# and if source target
doesn't exist
# and if target branch
doesn't exist
return
invalid_mr
unless
@merge_request
.
target_project
.
repository
.
branch_names
.
include?
(
@merge_request
.
target_branch
)
return
invalid_mr
unless
@merge_request
.
target_branch_exists?
# or if source branch doesn't exist
# or if source branch doesn't exist
return
invalid_mr
unless
@merge_request
.
source_project
.
repository
.
branch_names
.
include?
(
@merge_request
.
source_branch
)
return
invalid_mr
unless
@merge_request
.
source_branch_exists?
end
end
end
end
...
...
app/helpers/merge_requests_helper.rb
View file @
03e517e0
...
@@ -36,7 +36,7 @@ module MergeRequestsHelper
...
@@ -36,7 +36,7 @@ module MergeRequestsHelper
def
merge_path_description
(
merge_request
,
separator
)
def
merge_path_description
(
merge_request
,
separator
)
if
merge_request
.
for_fork?
if
merge_request
.
for_fork?
"Project:Branches:
#{
@merge_request
.
source_project
.
path_with_namespace
}
:
#{
@merge_request
.
source_branch
}
#{
separator
}
#{
@merge_request
.
target_project
.
path_with_namespace
}
:
#{
@merge_request
.
target_branch
}
"
"Project:Branches:
#{
@merge_request
.
source_project
_path
}
:
#{
@merge_request
.
source_branch
}
#{
separator
}
#{
@merge_request
.
target_project
.
path_with_namespace
}
:
#{
@merge_request
.
target_branch
}
"
else
else
"Branches:
#{
@merge_request
.
source_branch
}
#{
separator
}
#{
@merge_request
.
target_branch
}
"
"Branches:
#{
@merge_request
.
source_branch
}
#{
separator
}
#{
@merge_request
.
target_branch
}
"
end
end
...
...
app/models/merge_request.rb
View file @
03e517e0
...
@@ -35,6 +35,10 @@ class MergeRequest < ActiveRecord::Base
...
@@ -35,6 +35,10 @@ class MergeRequest < ActiveRecord::Base
attr_accessor
:should_remove_source_branch
attr_accessor
:should_remove_source_branch
# When this attribute is true some MR validation is ignored
# It allows us to close or modify broken merge requests
attr_accessor
:allow_broken
state_machine
:state
,
initial: :opened
do
state_machine
:state
,
initial: :opened
do
event
:close
do
event
:close
do
transition
[
:reopened
,
:opened
]
=>
:closed
transition
[
:reopened
,
:opened
]
=>
:closed
...
@@ -80,7 +84,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -80,7 +84,7 @@ class MergeRequest < ActiveRecord::Base
serialize
:st_commits
serialize
:st_commits
serialize
:st_diffs
serialize
:st_diffs
validates
:source_project
,
presence:
true
validates
:source_project
,
presence:
true
,
unless: :allow_broken
validates
:source_branch
,
presence:
true
validates
:source_branch
,
presence:
true
validates
:target_project
,
presence:
true
validates
:target_project
,
presence:
true
validates
:target_branch
,
presence:
true
validates
:target_branch
,
presence:
true
...
@@ -262,7 +266,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -262,7 +266,7 @@ class MergeRequest < ActiveRecord::Base
# Return the set of issues that will be closed if this merge request is accepted.
# Return the set of issues that will be closed if this merge request is accepted.
def
closes_issues
def
closes_issues
if
target_branch
==
project
.
default_branch
if
target_branch
==
project
.
default_branch
unmerged_
commits
.
map
{
|
c
|
c
.
closes_issues
(
project
)
}.
flatten
.
uniq
.
sort_by
(
&
:id
)
commits
.
map
{
|
c
|
c
.
closes_issues
(
project
)
}.
flatten
.
uniq
.
sort_by
(
&
:id
)
else
else
[]
[]
end
end
...
@@ -273,6 +277,34 @@ class MergeRequest < ActiveRecord::Base
...
@@ -273,6 +277,34 @@ class MergeRequest < ActiveRecord::Base
"merge request !
#{
iid
}
"
"merge request !
#{
iid
}
"
end
end
def
target_project_path
if
target_project
target_project
.
path_with_namespace
else
"(removed)"
end
end
def
source_project_path
if
source_project
source_project
.
path_with_namespace
else
"(removed)"
end
end
def
source_branch_exists?
return
false
unless
self
.
source_project
self
.
source_project
.
repository
.
branch_names
.
include?
(
self
.
source_branch
)
end
def
target_branch_exists?
return
false
unless
self
.
target_project
self
.
target_project
.
repository
.
branch_names
.
include?
(
self
.
target_branch
)
end
private
private
def
dump_commits
(
commits
)
def
dump_commits
(
commits
)
...
...
app/models/project.rb
View file @
03e517e0
...
@@ -55,11 +55,15 @@ class Project < ActiveRecord::Base
...
@@ -55,11 +55,15 @@ class Project < ActiveRecord::Base
has_one
:forked_project_link
,
dependent: :destroy
,
foreign_key:
"forked_to_project_id"
has_one
:forked_project_link
,
dependent: :destroy
,
foreign_key:
"forked_to_project_id"
has_one
:forked_from_project
,
through: :forked_project_link
has_one
:forked_from_project
,
through: :forked_project_link
has_many
:services
,
dependent: :destroy
# Merge Requests for target project should be removed with it
has_many
:events
,
dependent: :destroy
has_many
:merge_requests
,
dependent: :destroy
,
foreign_key:
"target_project_id"
has_many
:merge_requests
,
dependent: :destroy
,
foreign_key:
"target_project_id"
has_many
:fork_merge_requests
,
dependent: :destroy
,
foreign_key:
"source_project_id"
,
class_name:
MergeRequest
# Merge requests from source project should be kept when source project was removed
has_many
:fork_merge_requests
,
foreign_key:
"source_project_id"
,
class_name:
MergeRequest
has_many
:issues
,
->
{
order
"state DESC, created_at DESC"
},
dependent: :destroy
has_many
:issues
,
->
{
order
"state DESC, created_at DESC"
},
dependent: :destroy
has_many
:services
,
dependent: :destroy
has_many
:events
,
dependent: :destroy
has_many
:milestones
,
dependent: :destroy
has_many
:milestones
,
dependent: :destroy
has_many
:notes
,
dependent: :destroy
has_many
:notes
,
dependent: :destroy
has_many
:snippets
,
dependent: :destroy
,
class_name:
"ProjectSnippet"
has_many
:snippets
,
dependent: :destroy
,
class_name:
"ProjectSnippet"
...
...
app/views/projects/merge_requests/_form.html.haml
View file @
03e517e0
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
.span5
.span5
.clearfix
.clearfix
.pull-left
.pull-left
=
f
.
select
(
:source_project_id
,[[
@merge_request
.
source_project
.
path_with_namespace
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project chosen span3'
})
=
f
.
select
(
:source_project_id
,[[
@merge_request
.
source_project
_path
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project chosen span3'
})
.pull-left
.pull-left
=
f
.
select
(
:source_branch
,
@merge_request
.
source_project
.
repository
.
branch_names
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch chosen span2'
})
=
f
.
select
(
:source_branch
,
@merge_request
.
source_project
.
repository
.
branch_names
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch chosen span2'
})
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
03e517e0
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
%span
.pull-right
%span
.pull-right
-
if
merge_request
.
for_fork?
-
if
merge_request
.
for_fork?
%span
.light
%span
.light
=
"
#{
merge_request
.
source_project
.
path_with_namespace
}
"
=
"
#{
merge_request
.
source_project
_path
}
"
=
"
#{
merge_request
.
source_branch
}
"
=
"
#{
merge_request
.
source_branch
}
"
%i
.icon-angle-right.light
%i
.icon-angle-right.light
=
"
#{
merge_request
.
target_branch
}
"
=
"
#{
merge_request
.
target_branch
}
"
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
03e517e0
...
@@ -2,7 +2,10 @@
...
@@ -2,7 +2,10 @@
=
render
"projects/merge_requests/show/mr_title"
=
render
"projects/merge_requests/show/mr_title"
=
render
"projects/merge_requests/show/how_to_merge"
=
render
"projects/merge_requests/show/how_to_merge"
=
render
"projects/merge_requests/show/mr_box"
=
render
"projects/merge_requests/show/mr_box"
-
if
@merge_request
.
source_branch_exists?
&&
@merge_request
.
target_branch_exists?
=
render
"projects/merge_requests/show/mr_accept"
=
render
"projects/merge_requests/show/mr_accept"
-
else
=
render
"projects/merge_requests/show/no_accept"
-
if
@merge_request
.
source_project
.
gitlab_ci?
-
if
@merge_request
.
source_project
.
gitlab_ci?
=
render
"projects/merge_requests/show/mr_ci"
=
render
"projects/merge_requests/show/mr_ci"
=
render
"projects/merge_requests/show/commits"
=
render
"projects/merge_requests/show/commits"
...
...
app/views/projects/merge_requests/invalid.html.haml
View file @
03e517e0
...
@@ -3,15 +3,21 @@
...
@@ -3,15 +3,21 @@
=
render
"projects/merge_requests/show/mr_box"
=
render
"projects/merge_requests/show/mr_box"
.alert.alert-error
.alert.alert-error
%h5
%i
.icon-exclamation-sign
We cannot find
%span
.label-branch
=
@merge_request
.
source_branch
or
%span
.label-branch
=
@merge_request
.
target_branch
branches in the repository.
%p
Maybe it was removed or never pushed.
%p
%p
We cannot render this merge request properly because
-
if
@merge_request
.
for_fork?
&&
!
@merge_request
.
source_project
fork project was removed
-
elsif
!
@merge_request
.
source_branch_exists?
%span
.label.label-inverse
=
@merge_request
.
source_branch
does not exist in
%span
.label.label-info
=
@merge_request
.
source_project_path
-
elsif
!
@merge_request
.
target_branch_exists?
%span
.label.label-inverse
=
@merge_request
.
target_branch
does not exist in
%span
.label.label-info
=
@merge_request
.
target_project_path
-
else
of internal error
%strong
Please close Merge Request or change branches with existing one
Please close Merge Request or change branches with existing one
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
03e517e0
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
%strong
Step 1.
%strong
Step 1.
Checkout target branch and get recent objects from GitLab
Checkout target branch and get recent objects from GitLab
Assuming remote for
#{
@merge_request
.
target_project
.
path_with_namespace
}
is called
#{
target_remote
}
Assuming remote for
#{
@merge_request
.
target_project
.
path_with_namespace
}
is called
#{
target_remote
}
remote for
#{
@merge_request
.
source_project
.
path_with_namespace
}
is called
#{
source_remote
}
remote for
#{
@merge_request
.
source_project
_path
}
is called
#{
source_remote
}
%pre
.dark
%pre
.dark
:preserve
:preserve
git checkout
#{
target_remote
}
#{
@merge_request
.
target_branch
}
git checkout
#{
target_remote
}
#{
@merge_request
.
target_branch
}
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
03e517e0
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
if
@merge_request
.
for_fork?
-
if
@merge_request
.
for_fork?
%span
.label-branch
%span
.label-branch
%span
.label-project
=
truncate
(
@merge_request
.
source_project
.
path_with_namespace
,
length:
25
)
%span
.label-project
=
truncate
(
@merge_request
.
source_project
_path
,
length:
25
)
#{
@merge_request
.
source_branch
}
#{
@merge_request
.
source_branch
}
→
→
%span
.label-branch
=
@merge_request
.
target_branch
%span
.label-branch
=
@merge_request
.
target_branch
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
%li
=
link_to
"Email Patches"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :patch
)
%li
=
link_to
"Email Patches"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :diff
)
%li
=
link_to
"Plain Diff"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :diff
)
=
link_to
'Close'
,
project_merge_request_path
(
@project
,
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
"btn grouped btn-close"
,
title:
"Close merge request"
=
link_to
'Close'
,
project_merge_request_path
(
@project
,
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
"btn grouped btn-close"
,
title:
"Close merge request"
=
link_to
edit_project_merge_request_path
(
@project
,
@merge_request
),
class:
"btn grouped"
,
id
:"edit_merge_request"
do
=
link_to
edit_project_merge_request_path
(
@project
,
@merge_request
),
class:
"btn grouped"
,
id
:"edit_merge_request"
do
%i
.icon-edit
%i
.icon-edit
...
...
app/views/projects/merge_requests/show/_no_accept.html.haml
0 → 100644
View file @
03e517e0
.alert.alert-error
%p
This merge request can not be accepted because branch
-
unless
@merge_request
.
source_branch_exists?
%span
.label.label-inverse
=
@merge_request
.
source_branch
does not exist in
%span
.label.label-info
=
@merge_request
.
source_project_path
-
else
%span
.label.label-inverse
=
@merge_request
.
target_branch
does not exist in
%span
.label.label-info
=
@merge_request
.
target_project_path
%strong
Please close this merge request or change branches with existing one
spec/models/merge_request_spec.rb
View file @
03e517e0
...
@@ -112,7 +112,7 @@ describe MergeRequest do
...
@@ -112,7 +112,7 @@ describe MergeRequest do
let
(
:commit2
)
{
mock
(
'commit2'
,
closes_issues:
[
issue1
])
}
let
(
:commit2
)
{
mock
(
'commit2'
,
closes_issues:
[
issue1
])
}
before
do
before
do
subject
.
stub
(
unmerged_
commits:
[
commit0
,
commit1
,
commit2
])
subject
.
stub
(
commits:
[
commit0
,
commit1
,
commit2
])
end
end
it
'accesses the set of issues that will be closed on acceptance'
do
it
'accesses the set of issues that will be closed on acceptance'
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