diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-26 00:19:01 +0200 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-26 00:19:01 +0200 |
| commit | 78235edda8009e7dcec3f15b3ec79a0c17d9d797 (patch) | |
| tree | fd4750f09c6140b32f49016f81684f5aa054b999 /app/models/merge_request.rb | |
| parent | 847bba926929c4d64dcc5065b9b2762a62a87c87 (diff) | |
| download | gitlab-ce-78235edda8009e7dcec3f15b3ec79a0c17d9d797.tar.gz | |
Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 70780b75d45..9a79be12758 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -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 |