Merge branch 'rugged_build' into 'master'

Leave rugged to be installed from the gemfile. Set build configuration with bundle config.

We had 2 versions of rugged installed. Builds were passing due to caching so we shipped both 0.21 and 0.23 while only 0.23 was really used.

See merge request !576

config/software/gitlab-rails.rb

@@ -31,8 +31,8 @@ dependency "libicu"
 dependency "postgresql"
 dependency "python-docutils"
 dependency "mysql-client" if EE
-dependency "rugged"
 dependency "krb5"
+dependency "libgit2"
 
 source :git => "git@dev.gitlab.org:gitlab/gitlabhq.git"
 
@@ -48,6 +48,7 @@ build do
 
   bundle_without = %w{development test}
   bundle_without << "mysql" unless EE
+  bundle "config build.rugged --use-system-libraries", :env => env
   bundle "install --without #{bundle_without.join(" ")} --path=#{install_dir}/embedded/service/gem --jobs #{workers}", :env => env
 
   # In order to precompile the assets, we need to get to a state where rake can

config/software/libgit2.rb

@@ -17,7 +17,7 @@
 #
 
 name "libgit2"
-default_version "v0.21.2"
+default_version "v0.23.4"
 
 source git: "git://github.com/libgit2/libgit2.git"
 

config/software/rugged.rb

@@ -1,29 +0,0 @@
-#
-## Copyright:: Copyright (c) 2014 GitLab B.V.
-## License:: Apache License, Version 2.0
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-#
-
-name "rugged"
-default_version "0.21.2"
-
-dependency "ruby"
-dependency "rubygems"
-dependency "libgit2"
-
-build do
-  env = with_standard_compiler_flags(with_embedded_path)
-  gem "install rugged --install-dir=#{install_dir}/embedded/service/gem/ruby/2.1.0 --no-rdoc --no-ri -v #{version} -- --use-system-libraries", env: env
-end