Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
11728b50
Commit
11728b50
authored
Nov 22, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose artifacts path
parent
7b70a03e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
6 deletions
+22
-6
CHANGELOG
CHANGELOG
+1
-0
app/models/application_setting.rb
app/models/application_setting.rb
+1
-1
app/uploaders/artifact_uploader.rb
app/uploaders/artifact_uploader.rb
+3
-3
config/gitlab.yml.example
config/gitlab.yml.example
+6
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+8
-1
lib/ci/api/builds.rb
lib/ci/api/builds.rb
+2
-0
lib/gitlab/current_settings.rb
lib/gitlab/current_settings.rb
+1
-1
No files found.
CHANGELOG
View file @
11728b50
...
...
@@ -5,6 +5,7 @@ v 8.3.0 (unreleased)
v 8.2.0
- Improved performance of finding projects and groups in various places
- Improved performance of rendering user profile pages and Atom feeds
- Expose build artifacts path as config option
- Fix grouping of contributors by email in graph.
- Improved performance of finding issues with/without labels
- Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
...
...
app/models/application_setting.rb
View file @
11728b50
...
...
@@ -99,7 +99,7 @@ def self.create_from_defaults
restricted_signup_domains:
Settings
.
gitlab
[
'restricted_signup_domains'
],
import_sources:
[
'github'
,
'bitbucket'
,
'gitlab'
,
'gitorious'
,
'google_code'
,
'fogbugz'
,
'git'
],
shared_runners_enabled:
Settings
.
gitlab_ci
[
'shared_runners_enabled'
],
max_artifacts_size:
Settings
.
gitlab_ci
[
'max_artifacts
_size'
],
max_artifacts_size:
Settings
.
artifacts
[
'max
_size'
],
)
end
...
...
app/uploaders/artifact_uploader.rb
View file @
11728b50
...
...
@@ -5,15 +5,15 @@ class ArtifactUploader < CarrierWave::Uploader::Base
attr_accessor
:build
,
:field
def
self
.
artifacts_path
File
.
expand_path
(
'shared/artifacts/'
,
Rails
.
root
)
Gitlab
.
config
.
artifacts
.
path
end
def
self
.
artifacts_upload_path
File
.
expand_path
(
'shared/artifacts/tmp/uploads/'
,
Rails
.
root
)
File
.
join
(
self
.
artifacts_path
,
'tmp/uploads/'
)
end
def
self
.
artifacts_cache_path
File
.
expand_path
(
'shared/artifacts/tmp/cache/'
,
Rails
.
root
)
File
.
join
(
self
.
artifacts_path
,
'tmp/cache/'
)
end
def
initialize
(
build
,
field
)
...
...
config/gitlab.yml.example
View file @
11728b50
...
...
@@ -124,6 +124,12 @@ production: &base
# The mailbox where incoming mail will end up. Usually "inbox".
mailbox: "inbox"
## Build Artifacts
artifacts:
enabled: true
# The location where build artifacts are stored (default: shared/artifacts).
# path: shared/artifacts
## Git LFS
lfs:
enabled: true
...
...
config/initializers/1_settings.rb
View file @
11728b50
...
...
@@ -187,7 +187,6 @@ def base_gitlab_url
Settings
.
gitlab_ci
[
'add_pusher'
]
=
false
if
Settings
.
gitlab_ci
[
'add_pusher'
].
nil?
Settings
.
gitlab_ci
[
'url'
]
||=
Settings
.
send
(
:build_gitlab_ci_url
)
Settings
.
gitlab_ci
[
'builds_path'
]
=
File
.
expand_path
(
Settings
.
gitlab_ci
[
'builds_path'
]
||
"builds/"
,
Rails
.
root
)
Settings
.
gitlab_ci
[
'max_artifacts_size'
]
||=
100
# in megabytes
#
# Reply by email
...
...
@@ -199,6 +198,14 @@ def base_gitlab_url
Settings
.
incoming_email
[
'start_tls'
]
=
false
if
Settings
.
incoming_email
[
'start_tls'
].
nil?
Settings
.
incoming_email
[
'mailbox'
]
=
"inbox"
if
Settings
.
incoming_email
[
'mailbox'
].
nil?
#
# Build Artifacts
#
Settings
[
'artifacts'
]
||=
Settingslogic
.
new
({})
Settings
.
artifacts
[
'enabled'
]
=
true
if
Settings
.
artifacts
[
'enabled'
].
nil?
Settings
.
artifacts
[
'path'
]
=
File
.
expand_path
(
Settings
.
artifacts
[
'path'
]
||
File
.
join
(
Settings
.
shared
[
'path'
],
"artifacts"
),
Rails
.
root
)
Settings
.
artifacts
[
'max_size'
]
||=
100
# in megabytes
#
# Git LFS
#
...
...
lib/ci/api/builds.rb
View file @
11728b50
...
...
@@ -58,6 +58,7 @@ class Builds < Grape::API
# POST /builds/:id/artifacts/authorize
post
":id/artifacts/authorize"
do
require_gitlab_workhorse!
not_allowed!
unless
Gitlab
.
config
.
artifacts
.
enabled
build
=
Ci
::
Build
.
find_by_id
(
params
[
:id
])
not_found!
unless
build
authenticate_build_token!
(
build
)
...
...
@@ -91,6 +92,7 @@ class Builds < Grape::API
# POST /builds/:id/artifacts
post
":id/artifacts"
do
require_gitlab_workhorse!
not_allowed!
unless
Gitlab
.
config
.
artifacts
.
enabled
build
=
Ci
::
Build
.
find_by_id
(
params
[
:id
])
not_found!
unless
build
authenticate_build_token!
(
build
)
...
...
lib/gitlab/current_settings.rb
View file @
11728b50
...
...
@@ -25,7 +25,7 @@ def fake_application_settings
session_expire_delay:
Settings
.
gitlab
[
'session_expire_delay'
],
import_sources:
Settings
.
gitlab
[
'import_sources'
],
shared_runners_enabled:
Settings
.
gitlab_ci
[
'shared_runners_enabled'
],
max_artifacts_size:
Ci
::
Settings
.
gitlab_ci
[
'max_artifacts
_size'
],
max_artifacts_size:
Settings
.
artifacts
[
'max
_size'
],
)
end
...
...
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