From 39127045d4f727ca5be75c9534cd663015758159 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 17 Mar 2014 18:02:49 +0100 Subject: [PATCH] Include mysql2 gem for GitLab EE --- config/software/gitlab-rails.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb index 5b34885..f22aca1 100644 --- a/config/software/gitlab-rails.rb +++ b/config/software/gitlab-rails.rb @@ -47,7 +47,9 @@ build do # build. command "sed -i \"s/.*REVISION.*/REVISION = '$(git log --pretty=format:'%h' -n 1)'/\" config/initializers/2_app.rb" - bundle "install --without mysql development test --path=#{install_dir}/embedded/service/gem", :env => env + bundle_without = %w{development test} + bundle_without << "mysql" unless EE + bundle "install --without #{bundle_without.join(" ")} --path=#{install_dir}/embedded/service/gem", :env => env # In order to precompile the assets, we need to get to a state where rake can # load the Rails environment. -- libgit2 0.21.2