diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-26 21:13:27 +0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-26 21:13:27 +0200 |
| commit | 7a534231493f7f4220995b3accc92d4d002a6fa5 (patch) | |
| tree | 9a4d055bc2b851ffefdd89a41ecc8eb71495c5b0 /lib/api | |
| parent | 9931ef4a8a9fa9544729fe39cb3572d278819c8d (diff) | |
| download | gitlab-ce-37698-current-settings-singleton.tar.gz | |
WIP: Replace current settings module inclusion by "singleton"37698-current-settings-singleton
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/groups.rb | 2 | ||||
| -rw-r--r-- | lib/api/helpers/runner.rb | 2 | ||||
| -rw-r--r-- | lib/api/runner.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index e817dcbbc4b..2bbc72c8666 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -10,7 +10,7 @@ module API optional :visibility, type: String, values: Gitlab::VisibilityLevel.string_values, default: Gitlab::VisibilityLevel.string_level( - Gitlab::CurrentSettings.current_application_settings.default_group_visibility), + Gitlab::CurrentSettings.default_group_visibility), desc: 'The visibility of the group' optional :lfs_enabled, type: Boolean, desc: 'Enable/disable LFS for the projects in this group' optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access' diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb index 282af32ca94..74488cab146 100644 --- a/lib/api/helpers/runner.rb +++ b/lib/api/helpers/runner.rb @@ -1,7 +1,7 @@ module API module Helpers module Runner - include Gitlab::CurrentSettings + # include Gitlab::CurrentSettings JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze JOB_TOKEN_PARAM = :token diff --git a/lib/api/runner.rb b/lib/api/runner.rb index a3987c560dd..50b42668063 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -225,7 +225,7 @@ module API job.artifacts_file = artifacts job.artifacts_metadata = metadata job.artifacts_expire_in = params['expire_in'] || - Gitlab::CurrentSettings.current_application_settings.default_artifacts_expire_in + Gitlab::CurrentSettings.default_artifacts_expire_in if job.save present job, with: Entities::JobRequest::Response |