diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
commit | 3366f377c1d4cbb02ecc5a2e47b059ed375c5e09 (patch) | |
tree | 6a19813b4820ad6d2813bf86b30d8e5be2bd10c6 /lib/api/helpers | |
parent | 0abce36cd20cdd3579138bee835d28519a5593f2 (diff) | |
parent | cf887a8b3108edb715ee5618377f4ffab1824d85 (diff) | |
download | gitlab-ce-3366f377c1d4cbb02ecc5a2e47b059ed375c5e09.tar.gz |
Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
Diffstat (limited to 'lib/api/helpers')
-rw-r--r-- | lib/api/helpers/runner.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb index 87ba40e26e1..fbe30192a16 100644 --- a/lib/api/helpers/runner.rb +++ b/lib/api/helpers/runner.rb @@ -1,14 +1,12 @@ module API module Helpers module Runner - include Gitlab::CurrentSettings - JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze JOB_TOKEN_PARAM = :token def runner_registration_token_valid? ActiveSupport::SecurityUtils.variable_size_secure_compare(params[:token], - current_application_settings.runners_registration_token) + Gitlab::CurrentSettings.runners_registration_token) end def get_runner_version_from_params @@ -53,7 +51,7 @@ module API end def max_artifacts_size - current_application_settings.max_artifacts_size.megabytes.to_i + Gitlab::CurrentSettings.max_artifacts_size.megabytes.to_i end end end |