Download as
Browse Code »

Commit 39127045d4f727ca5be75c9534cd663015758159

Authored by Jacob Vosmaer
1 parent c8db6641
Exists in master and in 13 other branches 6-8-stable, 6-8-stable-ee, 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

Include mysql2 gem for GitLab EE

Showing 1 changed file with 3 additions and 1 deletions   Show diff stats
config/software/gitlab-rails.rb
  Diff comments   View file @3912704
@@ -47,7 +47,9 @@ build do @@ -47,7 +47,9 @@ build do
47 # build. 47 # build.
48 command "sed -i \"s/.*REVISION.*/REVISION = '$(git log --pretty=format:'%h' -n 1)'/\" config/initializers/2_app.rb" 48 command "sed -i \"s/.*REVISION.*/REVISION = '$(git log --pretty=format:'%h' -n 1)'/\" config/initializers/2_app.rb"
49 49
50 - bundle "install --without mysql development test --path=#{install_dir}/embedded/service/gem", :env => env 50 + bundle_without = %w{development test}
  51 + bundle_without << "mysql" unless EE
  52 + bundle "install --without #{bundle_without.join(" ")} --path=#{install_dir}/embedded/service/gem", :env => env
51 53
52 # In order to precompile the assets, we need to get to a state where rake can 54 # In order to precompile the assets, we need to get to a state where rake can
53 # load the Rails environment. 55 # load the Rails environment.