Commit afeb2dd9 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'sh-bump-rugged-0.28.0' into 'master'

Bump Rugged to 0.28.0

See merge request gitlab-org/gitlab-ce!25660
parents 7cfc090d 30caec32
...@@ -18,7 +18,7 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' ...@@ -18,7 +18,7 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
gem 'mysql2', '~> 0.4.10', group: :mysql gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 1.1', group: :postgres gem 'pg', '~> 1.1', group: :postgres
gem 'rugged', '~> 0.27' gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.0' gem 'grape-path-helpers', '~> 1.0'
gem 'faraday', '~> 0.12' gem 'faraday', '~> 0.12'
......
...@@ -784,7 +784,7 @@ GEM ...@@ -784,7 +784,7 @@ GEM
rubyntlm (0.6.2) rubyntlm (0.6.2)
rubypants (0.2.0) rubypants (0.2.0)
rubyzip (1.2.2) rubyzip (1.2.2)
rugged (0.27.5) rugged (0.28.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sanitize (4.6.6) sanitize (4.6.6)
crass (~> 1.0.2) crass (~> 1.0.2)
...@@ -1134,7 +1134,7 @@ DEPENDENCIES ...@@ -1134,7 +1134,7 @@ DEPENDENCIES
ruby-progressbar ruby-progressbar
ruby_parser (~> 3.8) ruby_parser (~> 3.8)
rubyzip (~> 1.2.2) rubyzip (~> 1.2.2)
rugged (~> 0.27) rugged (~> 0.28)
sanitize (~> 4.6) sanitize (~> 4.6)
sass (~> 3.5) sass (~> 3.5)
sass-rails (~> 5.0.6) sass-rails (~> 5.0.6)
......
...@@ -1688,6 +1688,11 @@ describe Gitlab::Git::Repository, :seed_helper do ...@@ -1688,6 +1688,11 @@ describe Gitlab::Git::Repository, :seed_helper do
expect(repository.delete_config(*%w[does.not.exist test.foo1 test.foo2])).to be_nil expect(repository.delete_config(*%w[does.not.exist test.foo1 test.foo2])).to be_nil
# Workaround for https://github.com/libgit2/rugged/issues/785: If
# Gitaly changes .gitconfig while Rugged has the file loaded
# Rugged::Repository#each_key will report stale values unless a
# lookup is done first.
expect(repository_rugged.config['test.foo1']).to be_nil
config_keys = repository_rugged.config.each_key.to_a config_keys = repository_rugged.config.each_key.to_a
expect(config_keys).not_to include('test.foo1') expect(config_keys).not_to include('test.foo1')
expect(config_keys).not_to include('test.foo2') expect(config_keys).not_to include('test.foo2')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment