diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-05-18 17:43:00 -0500 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-05-18 17:43:00 -0500 |
commit | e7a6d17b2b9a3a1b1cae0733da46ddedfe2dc3b1 (patch) | |
tree | 921c042797f98c41c1ef873db11a5dd0912f8da1 | |
parent | c337e748d385fea5c768a8e7de55975dca7fa484 (diff) | |
download | gitlab-ce-e7a6d17b2b9a3a1b1cae0733da46ddedfe2dc3b1.tar.gz |
fix some styling offender
-rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 | ||||
-rw-r--r-- | app/models/ci/build.rb | 4 | ||||
-rw-r--r-- | app/models/project.rb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index df98f56a1cd..f35d631df0c 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -97,7 +97,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController handle_signup_error end - def handle_service_ticket provider, ticket + def handle_service_ticket(provider, ticket) Gitlab::OAuth::Session.create provider, ticket session[:service_tickets] ||= {} session[:service_tickets][provider] = ticket diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 92327bdb08d..e8de22ddaf7 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -285,8 +285,8 @@ module Ci project.runners_token end - def valid_token? token - project.valid_runners_token? token + def valid_token?(token) + project.valid_runners_token?(token) end def can_be_served?(runner) diff --git a/app/models/project.rb b/app/models/project.rb index a3c4f1d8e9b..b32a30142c8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -947,13 +947,13 @@ class Project < ActiveRecord::Base shared_runners_enabled? && Ci::Runner.shared.active.any?(&block) end - def valid_runners_token? token + def valid_runners_token?(token) self.runners_token && ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.runners_token) end # TODO (ayufan): For now we use runners_token (backward compatibility) # In 8.4 every build will have its own individual token valid for time of build - def valid_build_token? token + def valid_build_token?(token) self.builds_enabled? && self.runners_token && ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.runners_token) end |