Skip to content
Snippets Groups Projects
Commit 14c1728f authored by Mayra Cabrera's avatar Mayra Cabrera
Browse files

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

Remove unnecessary freeze in app

See merge request gitlab-org/gitlab-ce!32636
parents 21924175 773eadbe
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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]
Loading
Loading
Loading
Loading
@@ -23,7 +23,7 @@ module ObjectStorage
end
end
 
TMP_UPLOAD_PATH = 'tmp/uploads'.freeze
TMP_UPLOAD_PATH = 'tmp/uploads'
 
module Store
LOCAL = 1
Loading
Loading
Loading
Loading
@@ -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
 
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment