Merge branch 'centos_env_fix' into 'master'

Centos Env Fix

config/software/gitlab-rails.rb

@@ -30,6 +30,12 @@ dependency "postgresql"
 source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git"
+env = {
+  "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
+  "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
+  "LD_RUN_PATH" => "#{install_dir}/embedded/lib",
+}
+
 build do
   # GitLab assumes it can extract the Git revision of the currently version
   # from the Git repo the code lives in at boot. Because of our rsync later on,
@@ -38,7 +44,7 @@ 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"
+  bundle "install --without mysql development test --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.