deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-26 00:19:01 +02:00
parent 847bba9269
commit 78235edda8
3 changed files with 85 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/merge_request.rb
View file

@ -60,7 +60,7 @@ class MergeRequest < ActiveRecord::Base
end
def check_if_can_be_merged
self.state = if Gitlab::Merge.new(self, self.author).can_be_merged?
self.state = if Gitlab::Satellite::MergeAction.new(self, self.author).can_be_merged?
CAN_BE_MERGED
else
CANNOT_BE_MERGED
@ -167,7 +167,7 @@ class MergeRequest < ActiveRecord::Base
end
def automerge!(current_user)
if Gitlab::Merge.new(self, current_user).merge! && self.unmerged_commits.empty?
if Gitlab::Satellite::MergeAction.new(self, current_user).merge! && self.unmerged_commits.empty?
self.merge!(current_user.id)
true
end