diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 12:09:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 12:09:33 +0000 |
| commit | 3775eba7c1d41443461e3abcdab2867bbc4636ae (patch) | |
| tree | 4c1ed52aa0dd296c1608e2d1d6911e86cdf29abf /Gemfile.lock | |
| parent | ed7568cc8083a9f8923d1a26bc0d8f60e3f629a3 (diff) | |
| download | gitlab-ce-3775eba7c1d41443461e3abcdab2867bbc4636ae.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 415ce44aab1..ac70d988c0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -416,7 +416,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.5.0.pre.rc1) + gitaly (13.5.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) @@ -1327,7 +1327,7 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.5.0.pre.rc1) + gitaly (~> 13.5.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-fog-azure-rm (~> 1.0) |