Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d1a89cf9
Commit
d1a89cf9
authored
Sep 04, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
858071a8
14c1728f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
app/presenters/ci/build_runner_presenter.rb
app/presenters/ci/build_runner_presenter.rb
+2
-2
app/uploaders/object_storage.rb
app/uploaders/object_storage.rb
+1
-1
app/workers/hashed_storage/base_worker.rb
app/workers/hashed_storage/base_worker.rb
+1
-1
app/workers/stuck_ci_jobs_worker.rb
app/workers/stuck_ci_jobs_worker.rb
+1
-1
No files found.
app/presenters/ci/build_runner_presenter.rb
View file @
d1a89cf9
...
...
@@ -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
]
...
...
app/uploaders/object_storage.rb
View file @
d1a89cf9
...
...
@@ -23,7 +23,7 @@ module ObjectStorage
end
end
TMP_UPLOAD_PATH
=
'tmp/uploads'
.
freeze
TMP_UPLOAD_PATH
=
'tmp/uploads'
module
Store
LOCAL
=
1
...
...
app/workers/hashed_storage/base_worker.rb
View file @
d1a89cf9
...
...
@@ -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
...
...
app/workers/stuck_ci_jobs_worker.rb
View file @
d1a89cf9
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment