BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 69d70400 by Dmitriy Zaporozhets
Options

Merge pull request #4076 from bke-drewb/4023

Fix regression caused by using newer version of Grape
parents 2e297c1e 245deb5c
Showing with 4 additions and 4 deletions
Gemfile
...@@ -41,8 +41,8 @@ gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib' ...@@ -41,8 +41,8 @@ gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib'
gem "github-linguist", require: "linguist" gem "github-linguist", require: "linguist"
# API # API
gem "grape" gem "grape", "~> 0.3.1"
gem "grape-entity" gem "grape-entity", "~> 0.2.0"
# Format dates and times # Format dates and times
# based on human-friendly examples # based on human-friendly examples
......
Gemfile.lock
...@@ -173,7 +173,7 @@ GEM ...@@ -173,7 +173,7 @@ GEM
gon (4.1.0) gon (4.1.0)
actionpack (>= 2.3.0) actionpack (>= 2.3.0)
json json
grape (0.4.1) grape (0.3.1)
activesupport activesupport
builder builder
hashie (>= 1.2.0) hashie (>= 1.2.0)
...@@ -183,7 +183,7 @@ GEM ...@@ -183,7 +183,7 @@ GEM
rack-accept rack-accept
rack-mount rack-mount
virtus virtus
grape-entity (0.3.0) grape-entity (0.2.0)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
growl (1.0.3) growl (1.0.3)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment