kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'remove-unnecessary-freeze-in-app' into 'master' 

Remove unnecessary freeze in app

See merge request gitlab-org/gitlab-ce!32636
This commit is contained in:
Mayra Cabrera 2019-09-04 18:10:44 +00:00
parent 21924175ea 773eadbef6
commit 14c1728f75
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/presenters/ci/build_runner_presenter.rb
View File

@ -4,8 +4,8 @@ module Ci
class BuildRunnerPresenter < SimpleDelegator
include Gitlab::Utils::StrongMemoize
RUNNER_REMOTE_TAG_PREFIX = 'refs/tags/'.freeze
RUNNER_REMOTE_BRANCH_PREFIX = 'refs/remotes/origin/'.freeze
RUNNER_REMOTE_TAG_PREFIX = 'refs/tags/'
RUNNER_REMOTE_BRANCH_PREFIX = 'refs/remotes/origin/'
def artifacts
return unless options[:artifacts]

2
app/uploaders/object_storage.rb
View File

@ -23,7 +23,7 @@ module ObjectStorage
end
end
TMP_UPLOAD_PATH = 'tmp/uploads'.freeze
TMP_UPLOAD_PATH = 'tmp/uploads'
module Store
LOCAL = 1

2
app/workers/hashed_storage/base_worker.rb
View File

@ -5,7 +5,7 @@ module HashedStorage
include ExclusiveLeaseGuard
LEASE_TIMEOUT = 30.seconds.to_i
LEASE_KEY_SEGMENT = 'project_migrate_hashed_storage_worker'.freeze
LEASE_KEY_SEGMENT = 'project_migrate_hashed_storage_worker'
protected

2
app/workers/stuck_ci_jobs_worker.rb
View File

@ -4,7 +4,7 @@ class StuckCiJobsWorker
include ApplicationWorker
include CronjobQueue
EXCLUSIVE_LEASE_KEY = 'stuck_ci_builds_worker_lease'.freeze
EXCLUSIVE_LEASE_KEY = 'stuck_ci_builds_worker_lease'
BUILD_RUNNING_OUTDATED_TIMEOUT = 1.hour
BUILD_PENDING_OUTDATED_TIMEOUT = 1.day