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

lib/ refactoring. Module Gitlabhq renamed to Gitlab

Browse source
This commit is contained in:
randx 2012-05-26 13:37:49 +03:00
parent 8ceb94081a
commit 3272620f72
20 changed files with 87 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/merge_request.rb
View file

@ -82,7 +82,7 @@ class MergeRequest < ActiveRecord::Base
end
def check_if_can_be_merged
self.state = if GitlabMerge.new(self, self.author).can_be_merged?
self.state = if Gitlab::Merge.new(self, self.author).can_be_merged?
CAN_BE_MERGED
else
CANNOT_BE_MERGED
@ -184,7 +184,7 @@ class MergeRequest < ActiveRecord::Base
end
def automerge!(current_user)
if GitlabMerge.new(self, current_user).merge
if Gitlab::Merge.new(self, current_user).merge
self.merge!(current_user.id)
true
end