Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
afeb2dd9
Commit
afeb2dd9
authored
Mar 19, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
Gemfile
Gemfile
+1
-1
Gemfile.lock
Gemfile.lock
+2
-2
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+5
-0
No files found.
Gemfile
View file @
afeb2dd9
...
...
@@ -18,7 +18,7 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
gem
'
mysql2
'
,
'~> 0.4.10'
,
group: :mysql
gem
'
pg
'
,
'~> 1.1'
,
group: :postgres
gem
'
rugged
'
,
'~> 0.2
7
'
gem
'
rugged
'
,
'~> 0.2
8
'
gem
'
grape-path-helpers
'
,
'~> 1.0'
gem
'
faraday
'
,
'~> 0.12'
...
...
Gemfile.lock
View file @
afeb2dd9
...
...
@@ -784,7 +784,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
rugged (0.2
7.5
)
rugged (0.2
8.0
)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
...
...
@@ -1134,7 +1134,7 @@ DEPENDENCIES
ruby-progressbar
ruby_parser (~> 3.8)
rubyzip (~> 1.2.2)
rugged (~> 0.2
7
)
rugged (~> 0.2
8
)
sanitize (~> 4.6)
sass (~> 3.5)
sass-rails (~> 5.0.6)
...
...
spec/lib/gitlab/git/repository_spec.rb
View file @
afeb2dd9
...
...
@@ -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
# 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
expect
(
config_keys
).
not_to
include
(
'test.foo1'
)
expect
(
config_keys
).
not_to
include
(
'test.foo2'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment