diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-17 17:41:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-03-17 17:41:44 +0000 |
| commit | 5409a3c5b7cb1aa66de7a8702b862556d7d49298 (patch) | |
| tree | 589f6e9c8a0029c700bd367b77b05fbb24d5625a /Gemfile.lock | |
| parent | c1b4f800f3a0fb5cc5c5f7a121a499ba6ed128c1 (diff) | |
| parent | c0a4f527db7d3e10f843468522d574cdb5427e86 (diff) | |
| download | gitlab-ce-5409a3c5b7cb1aa66de7a8702b862556d7d49298.tar.gz | |
Merge branch 'feature/use-gitaly-for-commit-show' into 'master'
Use Gitaly for CommitController#show
See merge request !9629
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 c60c045a4c2..734911baf3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -250,7 +250,7 @@ GEM json get_process_mem (0.2.0) gherkin-ruby (0.3.2) - gitaly (0.2.1) + gitaly (0.3.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -896,7 +896,7 @@ DEPENDENCIES fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.0) - gitaly (~> 0.2.1) + gitaly (~> 0.3.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |