diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-26 00:26:47 +0200 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-26 00:26:47 +0200 |
| commit | 8c89beb6f9bca14dd79fb1e0a81ebb65354edf73 (patch) | |
| tree | 18eb65ff3f0139f4526a2127b564b65fefe635b1 /app/models/merge_request.rb | |
| parent | 35b7a5395524d25e3bb9c20b473f1a1eb6970b6f (diff) | |
| download | gitlab-ce-8c89beb6f9bca14dd79fb1e0a81ebb65354edf73.tar.gz | |
Change argument order for satellite actions to always start with the user
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 9a79be12758..9238aa484df 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::Satellite::MergeAction.new(self, self.author).can_be_merged? + self.state = if Gitlab::Satellite::MergeAction.new(self.author, self).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::Satellite::MergeAction.new(self, current_user).merge! && self.unmerged_commits.empty? + if Gitlab::Satellite::MergeAction.new(current_user, self).merge! && self.unmerged_commits.empty? self.merge!(current_user.id) true end |