diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-05 09:35:58 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-10 16:10:18 +0200 |
| commit | 3de11e1a00868c95e71db64bc4b2b0f079f0f4d0 (patch) | |
| tree | 7e27fff52007ee24feac09b33966f5b68674a4a5 | |
| parent | ae88355bb87f4693603113ee16e4920d2d092f1e (diff) | |
| download | gitlab-ce-backport-ee-1525.tar.gz | |
Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePushbackport-ee-1525
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | lib/gitlab/checks/change_access.rb | 5 | ||||
| -rw-r--r-- | lib/gitlab/checks/force_push.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/git_access.rb | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb index eb2f2e144fd..8793b20aa35 100644 --- a/lib/gitlab/checks/change_access.rb +++ b/lib/gitlab/checks/change_access.rb @@ -5,7 +5,7 @@ module Gitlab attr_reader :user_access, :project, :skip_authorization, :protocol def initialize( - change, user_access:, project:, env: {}, skip_authorization: false, + change, user_access:, project:, skip_authorization: false, protocol: ) @oldrev, @newrev, @ref = change.values_at(:oldrev, :newrev, :ref) @@ -13,7 +13,6 @@ module Gitlab @tag_name = Gitlab::Git.tag_name(@ref) @user_access = user_access @project = project - @env = env @skip_authorization = skip_authorization @protocol = protocol end @@ -97,7 +96,7 @@ module Gitlab end def forced_push? - Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev, env: @env) + Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev) end def update? diff --git a/lib/gitlab/checks/force_push.rb b/lib/gitlab/checks/force_push.rb index 7284849aa18..1e73f89158d 100644 --- a/lib/gitlab/checks/force_push.rb +++ b/lib/gitlab/checks/force_push.rb @@ -1,7 +1,7 @@ module Gitlab module Checks class ForcePush - def self.force_push?(project, oldrev, newrev, env: {}) + def self.force_push?(project, oldrev, newrev) return false if project.empty_repo? # Created or deleted branch diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb index eea2f206902..99724db8da2 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -18,13 +18,12 @@ module Gitlab attr_reader :actor, :project, :protocol, :user_access, :authentication_abilities - def initialize(actor, project, protocol, authentication_abilities:, env: {}) + def initialize(actor, project, protocol, authentication_abilities:) @actor = actor @project = project @protocol = protocol @authentication_abilities = authentication_abilities @user_access = UserAccess.new(user, project: project) - @env = env end def check(cmd, changes) @@ -152,7 +151,6 @@ module Gitlab change, user_access: user_access, project: project, - env: @env, skip_authorization: deploy_key?, protocol: protocol ).exec |