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
diff --git a/lib/gitlab/satellite/action.rb b/lib/gitlab/satellite/action.rb
index 0d7eecdb218..d50e28fa219 100644
--- a/lib/gitlab/satellite/action.rb
+++ b/lib/gitlab/satellite/action.rb
@@ -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
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb
index fc4cd752be9..ffca6938901 100644
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
@@ -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