summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-09-13 19:40:40 +0000
committerRobert Speicher <robert@gitlab.com>2018-09-13 19:40:40 +0000
commit3da63dc0f44004e085e681bca46c5ef3f4e697ab (patch)
tree7b6e5dc473ee7a7da04cc996b960b49ccd804bff
parent5bdaf5167cfbeda5a795e531097f300f4accf2a6 (diff)
parent5d8e41fd3507f8e2c5b29528641c0cdb2da87e0f (diff)
downloadgitlab-ce-3da63dc0f44004e085e681bca46c5ef3f4e697ab.tar.gz
Merge branch 'da-update-gitaly-server' into 'master'
Update Gitlay server version to 0.121.0 See merge request gitlab-org/gitlab-ce!21725
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--spec/lib/gitlab/git/repository_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 99e0d1ed987..61825a7bf03 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.120.0
+0.121.0
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index dfe36d7d459..ce4caf0c27d 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -1752,7 +1752,7 @@ describe Gitlab::Git::Repository, :seed_helper do
describe '#checksum' do
it 'calculates the checksum for non-empty repo' do
- expect(repository.checksum).to eq '4be7d24ce7e8d845502d599b72d567d23e6a40c0'
+ expect(repository.checksum).to eq '51d0a9662681f93e1fee547a6b7ba2bcaf716059'
end
it 'returns 0000000000000000000000000000000000000000 for an empty repo' do