Download as
Browse Code »

Commit 104575b407ba47d2181b253473383e9ad40672e8

Authored by Jacob Vosmaer
1 parent 9bd7038e
Exists in master and in 11 other branches 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Clean up the gitlab-rails definition a bit

Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
config/software/gitlab-rails.rb
  Diff comments   View file @104575b
@@ -55,12 +55,14 @@ build do @@ -55,12 +55,14 @@ build do
55 # load the Rails environment. 55 # load the Rails environment.
56 command "cp config/gitlab.yml.example config/gitlab.yml" 56 command "cp config/gitlab.yml.example config/gitlab.yml"
57 command "cp config/database.yml.postgresql config/database.yml" 57 command "cp config/database.yml.postgresql config/database.yml"
  58 +
58 # There is a bug in the acts-as-taggable-on gem that makes 59 # There is a bug in the acts-as-taggable-on gem that makes
59 # rake assets:precompile check for a database connection. We do not have a 60 # rake assets:precompile check for a database connection. We do not have a
60 # database at this point so that is a problem. This bug is fixed in 61 # database at this point so that is a problem. This bug is fixed in
61 # acts-as-taggable-on 3.0.0 by 62 # acts-as-taggable-on 3.0.0 by
62 # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e 63 # https://github.com/mbleigh/acts-as-taggable-on/commit/ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e
63 aato_patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff" 64 aato_patch = "#{Omnibus.project_root}/config/patches/acts-as-taggable-on-ad02dc9bb24ec8e1e79e7e35e2d4bb5910a66d8e.diff"
  65 +
64 # To make this idempotent, we apply the patch (in case this is a first run) or 66 # To make this idempotent, we apply the patch (in case this is a first run) or
65 # we revert and re-apply the patch (if this is a second or later run). 67 # we revert and re-apply the patch (if this is a second or later run).
66 command "git apply #{aato_patch} || (git apply -R #{aato_patch} && git apply #{aato_patch})", 68 command "git apply #{aato_patch} || (git apply -R #{aato_patch} && git apply #{aato_patch})",
@@ -75,8 +77,10 @@ build do @@ -75,8 +77,10 @@ build do
75 # Tear down now that the assets:precompile is done. 77 # Tear down now that the assets:precompile is done.
76 command "rm config/gitlab.yml config/database.yml" 78 command "rm config/gitlab.yml config/database.yml"
77 79
78 - command "mkdir -p #{install_dir}/embedded/service/gitlab-rails" 80 + # Remove directories that will be created by `gitlab-ctl reconfigure`
79 command "rm -rf log tmp public/uploads" 81 command "rm -rf log tmp public/uploads"
  82 +
  83 + command "mkdir -p #{install_dir}/embedded/service/gitlab-rails"
80 command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-rails/" 84 command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-rails/"
81 85
82 # Create a wrapper for the rake tasks of the Rails app 86 # Create a wrapper for the rake tasks of the Rails app