diff options
author | Nick Thomas <nick@gitlab.com> | 2018-11-27 16:27:51 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-11-28 11:50:05 +0000 |
commit | 14076062df5d9f369c42796e754b3918965a0623 (patch) | |
tree | 6f3e1a36914178a879002a2872d8e1e114652a1c /Gemfile.rails4.lock | |
parent | a54352406ae4d85a8c3352b4f6a7dfe669ecd817 (diff) | |
download | gitlab-ce-14076062df5d9f369c42796e754b3918965a0623.tar.gz |
Commits API: Preserve file content in move operations if unspecified
Diffstat (limited to 'Gemfile.rails4.lock')
-rw-r--r-- | Gemfile.rails4.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 2542e085815..9f0e07384f0 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -272,7 +272,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.1.0) + gitaly-proto (1.2.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-markup (1.6.5) @@ -998,7 +998,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.1.0) + gitaly-proto (~> 1.2.0) github-markup (~> 1.7.0) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher |