diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-24 01:19:13 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-24 01:19:54 +0300 |
| commit | 69383ac2667b9d3c4d41422a91ace970b9be6091 (patch) | |
| tree | 3655bbe71f13f7588755f3f093cc83ec1dd0e01b /lib | |
| parent | 320c86abd769e9d057db4786c52f2d52507e933b (diff) | |
Merge branch 'ci-artifacts-path' into 'master'
Expose artifacts path
This fixes broken artifacts storage path.
Fixes #3607
Fixes #3608
Related: gitlab-org/omnibus-gitlab!544
See merge request !1869
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ci/api/builds.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb index 0a586672807..15faa6edd84 100644 --- a/lib/ci/api/builds.rb +++ b/lib/ci/api/builds.rb @@ -58,6 +58,7 @@ module Ci # 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 @@ module Ci # 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) diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 2d3e32d9539..46a4ef0e31f 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -25,7 +25,7 @@ module Gitlab 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 |