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

Riyad Preukschas
1 parent 35b7a539
Showing 3 changed files with 6 additions and 6 deletions Show diff stats
app/models/merge_request.rb
lib/gitlab/satellite/action.rb
lib/gitlab/satellite/merge_action.rb
@@ -60,7 +60,7 @@ class MergeRequest &lt; 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 &lt; 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
@@ -5,10 +5,10 @@ module Gitlab
       attr_accessor :options, :project, :user
-      def initialize(project, user, options = {})
+      def initialize(user, project, options = {})
+        @options = DEFAULT_OPTIONS.merge(options)
         @project = project
         @user = user
-        @options = DEFAULT_OPTIONS.merge(options)
       end
       protected
@@ -3,8 +3,8 @@ module Gitlab
     class MergeAction < Action
       attr_accessor :merge_request
-      def initialize(merge_request, user)
-        super merge_request.project, user
+      def initialize(user, merge_request)
+        super user, merge_request.project
         @merge_request = merge_request
       end
	@@ -60,7 +60,7 @@ class MergeRequest < ActiveRecord::Base		@@ -60,7 +60,7 @@ class MergeRequest < ActiveRecord::Base
60	end	60	end
61		61
62	def check_if_can_be_merged	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	CAN_BE_MERGED	64	CAN_BE_MERGED
65	else	65	else
66	CANNOT_BE_MERGED	66	CANNOT_BE_MERGED
	@@ -167,7 +167,7 @@ class MergeRequest < ActiveRecord::Base		@@ -167,7 +167,7 @@ class MergeRequest < ActiveRecord::Base
167	end	167	end
168		168
169	def automerge!(current_user)	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	self.merge!(current_user.id)	171	self.merge!(current_user.id)
172	true	172	true
173	end	173	end