diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-07-24 11:01:34 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-07-24 11:01:34 +0200 |
| commit | 0aefb51693747a06a3e9ecd5c7a29e14a5ac0383 (patch) | |
| tree | 1e109048dc85bd0d62bb5d5827c7379ea1ea3f87 /Gemfile.lock | |
| parent | 5505795ed2e65da20a896b67422a075515552a35 (diff) | |
| parent | 883488e0b2adda7dad93334f17f3895f05a7c587 (diff) | |
| download | gitlab-ce-0aefb51693747a06a3e9ecd5c7a29e14a5ac0383.tar.gz | |
Merge branch 'master' into backstage/gb/migrate-stages-statuses
* master: (97 commits)
Bulk update sidebar UI polish
Fix margin in mini graph for commits box
Add space between words in language dropdown
Fix support for old CI API when image or services are not specified
Short-circuit build coverage extraction for empty regexes
Update VERSION to 9.5.0-pre
Update CHANGELOG.md for 9.4.0
Compress gitlab svg logo
Fix the gcovr coverage regex by removing line separators before scanning
Capitalize Sidekiq word in dev doc
Add 1px to breadcrumbs min height
Update nginx docs
Use custom font SVG for logo
Port spinach tests to rspec feature specs
Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'
Copy-edit background migrations guidelines
Add Traditional Chinese in Taiwan translations of Pipeline Schedules
Fix new project selectors in GitLab QA
Reword success to passing for pipeline badges
Rename build to pipeline for status badges
...
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index dfa7acc8917..b0b437ae342 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -269,7 +269,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.14.0) + gitaly (0.18.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -332,13 +332,13 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grape (0.19.1) + grape (0.19.2) activesupport builder hashie (>= 2.1.0) multi_json (>= 1.3.2) multi_xml (>= 0.5.2) - mustermann-grape (~> 0.4.0) + mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept virtus (>= 1.0.0) @@ -463,10 +463,9 @@ GEM multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (0.4.0) - tool (~> 0.2) - mustermann-grape (0.4.0) - mustermann (= 0.4.0) + mustermann (1.0.0) + mustermann-grape (1.0.0) + mustermann (~> 1.0.0) mysql2 (0.4.5) net-ldap (0.12.1) netrc (0.11.0) @@ -850,7 +849,6 @@ GEM timfel-krb5-auth (0.8.3) toml-rb (0.3.15) citrus (~> 3.0, > 3.0) - tool (0.2.3) truncato (0.7.8) htmlentities (~> 4.3.1) nokogiri (~> 1.6.1) @@ -972,7 +970,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.14.0) + gitaly (~> 0.18.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) @@ -981,7 +979,7 @@ DEPENDENCIES gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) google-api-client (~> 0.8.6) - grape (~> 0.19.0) + grape (~> 0.19.2) grape-entity (~> 0.6.0) haml_lint (~> 0.21.0) hamlit (~> 2.6.1) |