diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-04-21 15:02:21 +0200 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-05-07 23:37:42 +0200 |
| commit | 34cd10979757cdad26056a532cf09c59a7f74ae9 (patch) | |
| tree | 28644688c71cdd089870444eba9a5455f1535143 /Gemfile.lock | |
| parent | 6ad3814e1b31bfacfae7a2aabb4e4607b12ca66f (diff) | |
| download | gitlab-ce-34cd10979757cdad26056a532cf09c59a7f74ae9.tar.gz | |
Re-enable Gitaly commit_raw_diff feature
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 01c35a935f2..c0c56aa9602 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,7 +263,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.5.0) + gitaly (0.6.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -434,7 +434,7 @@ GEM rugged (~> 0.24) little-plugger (1.1.4) locale (2.1.2) - logging (2.1.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) loofah (2.0.3) @@ -922,7 +922,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.5.0) + gitaly (~> 0.6.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |