deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-26 00:26:47 +02:00
parent 35b7a53955
commit 8c89beb6f9
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/satellite/action.rb
View file

@ -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

4
lib/gitlab/satellite/merge_action.rb
View file

@ -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