diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-06 23:43:58 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-06 23:43:58 +0300 |
| commit | c3bbad762d418857e3f5b52222f5eedd62663229 (patch) | |
| tree | c5b7083396734b3d13883a7316e223a73135a441 /Gemfile.lock | |
| parent | 60011bc42e3d820344e804f70d170c0c8b25d7e9 (diff) | |
| parent | 9395d198f9b9ec59858d2f316e58cda22ab80050 (diff) | |
Merge branch '19376-post-bfg-cleanup' into 'master'
Allow internal references to be removed
Closes #19376
See merge request gitlab-org/gitlab-ce!23189
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 f51eaef9357..8a9e023c8ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.2.0) + gitaly-proto (1.3.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -1007,7 +1007,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.2.0) + gitaly-proto (~> 1.3.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) |