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
f2cac135
Commit
f2cac135
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Undev-state-machine-stage-2'
parents
0cc95ef2
5ac5510f
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
97 additions
and
82 deletions
+97
-82
app/controllers/merge_requests_controller.rb
app/controllers/merge_requests_controller.rb
+1
-1
app/models/merge_request.rb
app/models/merge_request.rb
+30
-57
app/models/project.rb
app/models/project.rb
+1
-1
app/views/merge_requests/_show.html.haml
app/views/merge_requests/_show.html.haml
+2
-2
db/migrate/20130220124204_add_new_merge_status_to_merge_request.rb
...e/20130220124204_add_new_merge_status_to_merge_request.rb
+5
-0
db/migrate/20130220125544_convert_merge_status_in_merge_request.rb
...e/20130220125544_convert_merge_status_in_merge_request.rb
+17
-0
db/migrate/20130220125545_remove_merge_status_from_merge_request.rb
.../20130220125545_remove_merge_status_from_merge_request.rb
+9
-0
db/migrate/20130220133245_rename_new_merge_status_to_merge_status_in_milestone.rb
...5_rename_new_merge_status_to_merge_status_in_milestone.rb
+5
-0
db/schema.rb
db/schema.rb
+21
-21
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+6
-0
No files found.
app/controllers/merge_requests_controller.rb
View file @
f2cac135
...
...
@@ -75,7 +75,7 @@ class MergeRequestsController < ProjectResourceController
if
@merge_request
.
unchecked?
@merge_request
.
check_if_can_be_merged
end
render
json:
{
merge_status:
@merge_request
.
human_merge_status
}
render
json:
{
merge_status:
@merge_request
.
merge_status_name
}
rescue
Gitlab
::
SatelliteNotExistError
render
json:
{
merge_status: :no_satellite
}
end
...
...
This diff is collapsed.
Click to expand it.
app/models/merge_request.rb
View file @
f2cac135
...
...
@@ -24,6 +24,8 @@ require Rails.root.join("lib/static_model")
class
MergeRequest
<
ActiveRecord
::
Base
include
Issuable
BROKEN_DIFF
=
"--broken-diff"
attr_accessible
:title
,
:assignee_id
,
:target_branch
,
:source_branch
,
:milestone_id
,
:author_id_of_changes
,
:state_event
...
...
@@ -51,11 +53,25 @@ class MergeRequest < ActiveRecord::Base
state
:merged
end
BROKEN_DIFF
=
"--broken-diff"
state_machine
:merge_status
,
initial: :unchecked
do
event
:mark_as_unchecked
do
transition
[
:can_be_merged
,
:cannot_be_merged
]
=>
:unchecked
end
event
:mark_as_mergeable
do
transition
unchecked: :can_be_merged
end
event
:mark_as_unmergeable
do
transition
unchecked: :cannot_be_merged
end
state
:unchecked
UNCHECKED
=
1
CAN_BE_MERGED
=
2
CANNOT_BE_MERGED
=
3
state
:can_be_merged
state
:cannot_be_merged
end
serialize
:st_commits
serialize
:st_diffs
...
...
@@ -65,38 +81,14 @@ class MergeRequest < ActiveRecord::Base
validate
:validate_branches
scope
:merged
,
->
{
with_state
(
:merged
)
}
scope
:by_branch
,
->
(
branch_name
)
{
where
(
"source_branch LIKE :branch OR target_branch LIKE :branch"
,
branch:
branch_name
)
}
scope
:cared
,
->
(
user
)
{
where
(
'assignee_id = :user OR author_id = :user'
,
user:
user
.
id
)
}
scope
:by_milestone
,
->
(
milestone
)
{
where
(
milestone_id:
milestone
)
}
# Closed scope for merge request should return
# both merged and closed mr's
scope
:closed
,
->
{
with_states
(
:closed
,
:merged
)
}
class
<<
self
def
find_all_by_branch
(
branch_name
)
where
(
"source_branch LIKE :branch OR target_branch LIKE :branch"
,
branch:
branch_name
)
end
def
cared
(
user
)
where
(
'assignee_id = :user OR author_id = :user'
,
user:
user
.
id
)
end
def
find_all_by_branch
(
branch_name
)
where
(
"source_branch LIKE :branch OR target_branch LIKE :branch"
,
branch:
branch_name
)
end
def
find_all_by_milestone
(
milestone
)
where
(
"milestone_id = :milestone_id"
,
milestone_id:
milestone
)
end
end
def
human_merge_status
merge_statuses
=
{
CAN_BE_MERGED
=>
"can_be_merged"
,
CANNOT_BE_MERGED
=>
"cannot_be_merged"
,
UNCHECKED
=>
"unchecked"
}
merge_statuses
[
self
.
merge_status
]
end
def
validate_branches
if
target_branch
==
source_branch
errors
.
add
:base
,
"You can not use same branch for source and target branches"
...
...
@@ -108,26 +100,12 @@ class MergeRequest < ActiveRecord::Base
self
.
reloaded_diffs
end
def
unchecked?
merge_status
==
UNCHECKED
end
def
mark_as_unchecked
self
.
merge_status
=
UNCHECKED
self
.
save
end
def
can_be_merged?
merge_status
==
CAN_BE_MERGED
end
def
check_if_can_be_merged
self
.
merge_status
=
if
Gitlab
::
Satellite
::
MergeAction
.
new
(
self
.
author
,
self
).
can_be_merged?
CAN_BE_MERGED
if
Gitlab
::
Satellite
::
MergeAction
.
new
(
self
.
author
,
self
).
can_be_merged?
mark_as_mergeable
else
CANNOT_BE_MERGED
mark_as_unmergeable
end
self
.
save
end
def
diffs
...
...
@@ -182,11 +160,6 @@ class MergeRequest < ActiveRecord::Base
commits
.
any?
&&
opened?
end
def
mark_as_unmergable
self
.
merge_status
=
CANNOT_BE_MERGED
self
.
save
end
def
reloaded_commits
if
opened?
&&
unmerged_commits
.
any?
self
.
st_commits
=
unmerged_commits
...
...
@@ -221,7 +194,7 @@ class MergeRequest < ActiveRecord::Base
true
end
rescue
self
.
mark_as_unmerg
able
mark_as_unmerge
able
false
end
...
...
This diff is collapsed.
Click to expand it.
app/models/project.rb
View file @
f2cac135
...
...
@@ -321,7 +321,7 @@ class Project < ActiveRecord::Base
c_ids
=
self
.
repository
.
commits_between
(
oldrev
,
newrev
).
map
(
&
:id
)
# Update code for merge requests
mrs
=
self
.
merge_requests
.
opened
.
find_all_
by_branch
(
branch_name
).
all
mrs
=
self
.
merge_requests
.
opened
.
by_branch
(
branch_name
).
all
mrs
.
each
{
|
merge_request
|
merge_request
.
reload_code
;
merge_request
.
mark_as_unchecked
}
# Close merge requests
...
...
This diff is collapsed.
Click to expand it.
app/views/merge_requests/_show.html.haml
View file @
f2cac135
...
...
@@ -29,10 +29,10 @@
$
(
function
(){
merge_request
=
new
MergeRequest
({
url_to_automerge_check
:
"
#{
automerge_check_project_merge_request_path
(
@project
,
@merge_request
)
}
"
,
check_enable
:
#{
@merge_request
.
merge_status
==
MergeRequest
::
UNCHECKED
?
"true"
:
"false"
}
,
check_enable
:
#{
@merge_request
.
unchecked?
?
"true"
:
"false"
}
,
url_to_ci_check
:
"
#{
ci_status_project_merge_request_path
(
@project
,
@merge_request
)
}
"
,
ci_enable
:
#{
@project
.
gitlab_ci?
?
"true"
:
"false"
}
,
current_status
:
"
#{
@merge_request
.
human_merge_status
}
"
,
current_status
:
"
#{
@merge_request
.
merge_status_name
}
"
,
action
:
"
#{
controller
.
action_name
}
"
});
});
...
...
This diff is collapsed.
Click to expand it.
db/migrate/20130220124204_add_new_merge_status_to_merge_request.rb
0 → 100644
View file @
f2cac135
class
AddNewMergeStatusToMergeRequest
<
ActiveRecord
::
Migration
def
change
add_column
:merge_requests
,
:new_merge_status
,
:string
end
end
This diff is collapsed.
Click to expand it.
db/migrate/20130220125544_convert_merge_status_in_merge_request.rb
0 → 100644
View file @
f2cac135
class
ConvertMergeStatusInMergeRequest
<
ActiveRecord
::
Migration
def
up
MergeRequest
.
transaction
do
MergeRequest
.
where
(
merge_status:
1
).
update_all
(
"new_merge_status = 'unchecked'"
)
MergeRequest
.
where
(
merge_status:
2
).
update_all
(
"new_merge_status = 'can_be_merged'"
)
MergeRequest
.
where
(
merge_status:
3
).
update_all
(
"new_merge_status = 'cannot_be_merged'"
)
end
end
def
down
MergeRequest
.
transaction
do
MergeRequest
.
where
(
new_merge_status: :unchecked
).
update_all
(
"merge_status = 1"
)
MergeRequest
.
where
(
new_merge_status: :can_be_merged
).
update_all
(
"merge_status = 2"
)
MergeRequest
.
where
(
new_merge_status: :cannot_be_merged
).
update_all
(
"merge_status = 3"
)
end
end
end
This diff is collapsed.
Click to expand it.
db/migrate/20130220125545_remove_merge_status_from_merge_request.rb
0 → 100644
View file @
f2cac135
class
RemoveMergeStatusFromMergeRequest
<
ActiveRecord
::
Migration
def
up
remove_column
:merge_requests
,
:merge_status
end
def
down
add_column
:merge_requests
,
:merge_status
,
:integer
end
end
This diff is collapsed.
Click to expand it.
db/migrate/20130220133245_rename_new_merge_status_to_merge_status_in_milestone.rb
0 → 100644
View file @
f2cac135
class
RenameNewMergeStatusToMergeStatusInMilestone
<
ActiveRecord
::
Migration
def
change
rename_column
:merge_requests
,
:new_merge_status
,
:merge_status
end
end
This diff is collapsed.
Click to expand it.
db/schema.rb
View file @
f2cac135
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
:version
=>
201302
18141554
)
do
ActiveRecord
::
Schema
.
define
(
:version
=>
201302
20133245
)
do
create_table
"events"
,
:force
=>
true
do
|
t
|
t
.
string
"target_type"
...
...
@@ -78,9 +78,9 @@ ActiveRecord::Schema.define(:version => 20130218141554) do
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
text
"st_commits"
,
:limit
=>
2147483647
t
.
text
"st_diffs"
,
:limit
=>
2147483647
t
.
integer
"merge_status"
,
:default
=>
1
,
:null
=>
false
t
.
integer
"milestone_id"
t
.
string
"state"
t
.
string
"merge_status"
end
add_index
"merge_requests"
,
[
"assignee_id"
],
:name
=>
"index_merge_requests_on_assignee_id"
...
...
This diff is collapsed.
Click to expand it.
spec/models/merge_request_spec.rb
View file @
f2cac135
...
...
@@ -32,6 +32,12 @@ describe MergeRequest do
it
{
should_not
allow_mass_assignment_of
(
:project_id
)
}
end
describe
"Respond to"
do
it
{
should
respond_to
(
:unchecked?
)
}
it
{
should
respond_to
(
:can_be_merged?
)
}
it
{
should
respond_to
(
:cannot_be_merged?
)
}
end
describe
'modules'
do
it
{
should
include_module
(
Issuable
)
}
end
...
...
This diff is collapsed.
Click to expand it.
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