Include mysql2 gem for GitLab EE

Jacob Vosmaer
1 parent c8db6641
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
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.
...	...	@@ -47,7 +47,9 @@ build do
47	47	# build.
48	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	54	# In order to precompile the assets, we need to get to a state where rake can
53	55	# load the Rails environment.
...	...