Download as
Browse Code »

Commit d864f7e8e717c848cc8397ca5695fdb2441f442e

Authored by Jacob Vosmaer
2 parents 039029d0 ff2ab63b
Exists in master and in 4 other branches 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee

Merge branch 'repository_downloads_path' into 'master' 

Support the repository_downloads_path setting
Showing 4 changed files with 5 additions and 2 deletions   Show diff stats
@@ -15,6 +15,7 @@ omnibus-gitlab repository. @@ -15,6 +15,7 @@ omnibus-gitlab repository.
15 - Only reject SMTP attributes which are nil 15 - Only reject SMTP attributes which are nil
16 - Support changing the 'restricted_visibility_levels' option (Javier Palomo) 16 - Support changing the 'restricted_visibility_levels' option (Javier Palomo)
17 - Only start omnibus-gitlab services after a given filesystem is mounted 17 - Only start omnibus-gitlab services after a given filesystem is mounted
  18 +- Support the repository_downloads_path setting in gitlab.yml
18 19
19 7.0.0-ee.omnibus.1 20 7.0.0-ee.omnibus.1
20 - Fix MySQL build for Ubuntu 14.04 21 - Fix MySQL build for Ubuntu 14.04
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @d864f7e
@@ -67,6 +67,7 @@ default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = tru @@ -67,6 +67,7 @@ default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = tru
67 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wall'] = false 67 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wall'] = false
68 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = false 68 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = false
69 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = "private" 69 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = "private"
  70 +default['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'] = nil
70 default['gitlab']['gitlab-rails']['issues_tracker_redmine'] = false 71 default['gitlab']['gitlab-rails']['issues_tracker_redmine'] = false
71 default['gitlab']['gitlab-rails']['issues_tracker_redmine_title'] = "Redmine" 72 default['gitlab']['gitlab-rails']['issues_tracker_redmine_title'] = "Redmine"
72 default['gitlab']['gitlab-rails']['issues_tracker_redmine_project_url'] = "http://redmine.sample/projects/:issues_tracker_id" 73 default['gitlab']['gitlab-rails']['issues_tracker_redmine_project_url'] = "http://redmine.sample/projects/:issues_tracker_id"
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
  Diff comments   View file @d864f7e
@@ -31,8 +31,9 @@ gitlab_rails_log_dir = node['gitlab']['gitlab-rails']['log_directory'] @@ -31,8 +31,9 @@ gitlab_rails_log_dir = node['gitlab']['gitlab-rails']['log_directory']
31 gitlab_rails_tmp_dir, 31 gitlab_rails_tmp_dir,
32 gitlab_rails_public_uploads_dir, 32 gitlab_rails_public_uploads_dir,
33 node['gitlab']['gitlab-rails']['backup_path'], 33 node['gitlab']['gitlab-rails']['backup_path'],
  34 + node['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'],
34 gitlab_rails_log_dir 35 gitlab_rails_log_dir
35 -].each do |dir_name| 36 +].compact.each do |dir_name|
36 directory dir_name do 37 directory dir_name do
37 owner node['gitlab']['user']['username'] 38 owner node['gitlab']['user']['username']
38 mode '0700' 39 mode '0700'
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @d864f7e
@@ -74,7 +74,7 @@ production: &base @@ -74,7 +74,7 @@ production: &base
74 ## Repository downloads directory 74 ## Repository downloads directory
75 # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory. 75 # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
76 # The default is 'tmp/repositories' relative to the root of the Rails app. 76 # The default is 'tmp/repositories' relative to the root of the Rails app.
77 - # repository_downloads_path: tmp/repositories 77 + repository_downloads_path: <%= @gitlab_repository_downloads_path %>
78 78
79 ## External issues trackers 79 ## External issues trackers
80 issues_tracker: 80 issues_tracker: