Download as
Browse Code »

Commit 8c89beb6f9bca14dd79fb1e0a81ebb65354edf73

Authored by Riyad Preukschas
1 parent 35b7a539
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Change argument order for satellite actions to always start with the user

Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
app/models/merge_request.rb
  Diff comments   View file @8c89beb
... ... @@ -60,7 +60,7 @@ class MergeRequest < ActiveRecord::Base
60 60 end
61 61  
62 62 def check_if_can_be_merged
63   - self.state = if Gitlab::Satellite::MergeAction.new(self, self.author).can_be_merged?
  63 + self.state = if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
64 64 CAN_BE_MERGED
65 65 else
66 66 CANNOT_BE_MERGED
... ... @@ -167,7 +167,7 @@ class MergeRequest < ActiveRecord::Base
167 167 end
168 168  
169 169 def automerge!(current_user)
170   - if Gitlab::Satellite::MergeAction.new(self, current_user).merge! && self.unmerged_commits.empty?
  170 + if Gitlab::Satellite::MergeAction.new(current_user, self).merge! && self.unmerged_commits.empty?
171 171 self.merge!(current_user.id)
172 172 true
173 173 end
... ...
lib/gitlab/satellite/action.rb
  Diff comments   View file @8c89beb
... ... @@ -5,10 +5,10 @@ module Gitlab
5 5  
6 6 attr_accessor :options, :project, :user
7 7  
8   - def initialize(project, user, options = {})
  8 + def initialize(user, project, options = {})
  9 + @options = DEFAULT_OPTIONS.merge(options)
9 10 @project = project
10 11 @user = user
11   - @options = DEFAULT_OPTIONS.merge(options)
12 12 end
13 13  
14 14 protected
... ...
lib/gitlab/satellite/merge_action.rb
  Diff comments   View file @8c89beb
... ... @@ -3,8 +3,8 @@ module Gitlab
3 3 class MergeAction < Action
4 4 attr_accessor :merge_request
5 5  
6   - def initialize(merge_request, user)
7   - super merge_request.project, user
  6 + def initialize(user, merge_request)
  7 + super user, merge_request.project
8 8 @merge_request = merge_request
9 9 end
10 10  
... ...