diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-03-29 16:10:43 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-04-06 08:17:07 -0700 |
| commit | a18eea8c32381b9514083e796a8504fdfc2c81d9 (patch) | |
| tree | 85643264b363a582baf884d2df518450323d13aa /Gemfile.lock | |
| parent | 44f4a674e2a87d104f700265d835aba000c589f0 (diff) | |
| download | gitlab-ce-a18eea8c32381b9514083e796a8504fdfc2c81d9.tar.gz | |
Automatically cleanup stale worktrees and lock files upon a push
git 2.16 will fail badly if there are stale worktrees.
Closes #44115
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 55e7bd9492a..1e6fe7638a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -290,7 +290,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.91.0) + gitaly-proto (0.94.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (5.3.3) @@ -1061,7 +1061,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.91.0) + gitaly-proto (~> 0.94.0) github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |