diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-12 17:52:09 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-12 17:52:09 -0500 |
| commit | 53e11239ce9e7f9513c890a78df41c611bcc2ae1 (patch) | |
| tree | 08300d49b78dff43f95e52cc298fa8732b9a32a9 /Gemfile.lock | |
| parent | d8cc4540ab83c98a09b11d1654fac593c47384c8 (diff) | |
| parent | 8d47e9f8e13c2ca43520b348dde0424fe6460cc9 (diff) | |
| download | gitlab-ce-53e11239ce9e7f9513c890a78df41c611bcc2ae1.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
* master: (104 commits)
Update licenses
fix a wrong method call in the refactor
fix a whitespace
fix for discussion
Update templates via:
Update doc accordingly to:
Cache issuable template names
Fix the format of rugged alternate directory list
Match full file path in FileDetector
Fixes from CSS refactor
Resolve "Prometheus service page shows error"
Explicit state integration deletion
Move all API authentication code to APIGuard
Shorten example translation for inclusive language
[ci-skip] add changelog
fix the merger override to remove source branch
add spec
Removed d3.js from the users and graphs bundle
Cleanup data-page attribute after each Karma test
Update template description wording
...
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 0b56058defc..5bf1d6a8bc2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.39.0) + gitaly-proto (0.41.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1023,7 +1023,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.39.0) + gitaly-proto (~> 0.41.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |