diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-05-06 13:01:02 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-05-06 13:01:02 +0300 |
commit | 464a1190c3b17f687c4f55c41bcbd72355324eef (patch) | |
tree | 5f0c0b748735ad4632b21ca270b7dc5b165c4732 | |
parent | 351df5a90c9f3d9fd57bca0a8220f7d72e82caef (diff) | |
download | gitlab-ce-update-grape.tar.gz |
Update grape gemupdate-grape
-rw-r--r-- | Gemfile | 4 | ||||
-rw-r--r-- | Gemfile.lock | 15 |
2 files changed, 10 insertions, 9 deletions
@@ -66,8 +66,8 @@ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false gem "github-linguist", "~> 4.7.0", require: "linguist" # API -gem 'grape', '~> 0.13.0' -gem 'grape-entity', '~> 0.4.2' +gem 'grape', '~> 0.16.2' +gem 'grape-entity', '~> 0.5.1' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination diff --git a/Gemfile.lock b/Gemfile.lock index b19dc5b6d20..e6983fc3fac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,6 +182,7 @@ GEM launchy (~> 2.1) mail (~> 2.2) encryptor (1.3.0) + enumerable-lazy (0.0.1) equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) @@ -381,17 +382,17 @@ GEM json multi_json request_store (>= 1.0) - grape (0.13.0) + grape (0.16.2) activesupport builder hashie (>= 2.1.0) multi_json (>= 1.3.2) multi_xml (>= 0.5.2) + mustermann19 (~> 0.4.3) rack (>= 1.3.0) rack-accept - rack-mount virtus (>= 1.0.0) - grape-entity (0.4.8) + grape-entity (0.5.1) activesupport multi_json (>= 1.3.2) haml (4.0.7) @@ -475,6 +476,8 @@ GEM multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) + mustermann19 (0.4.3) + enumerable-lazy mysql2 (0.3.20) nested_form (0.3.2) net-ldap (0.12.1) @@ -581,8 +584,6 @@ GEM rack-attack (4.3.1) rack rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-oauth2 (1.2.1) activesupport (>= 2.3) attr_required (>= 0.0.5) @@ -945,8 +946,8 @@ DEPENDENCIES gollum-lib (~> 4.1.0) gollum-rugged_adapter (~> 0.4.2) gon (~> 6.0.1) - grape (~> 0.13.0) - grape-entity (~> 0.4.2) + grape (~> 0.16.2) + grape-entity (~> 0.5.1) haml-rails (~> 0.9.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) |