diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-27 04:56:07 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-27 04:56:07 -0700 |
| commit | 69d70400cc8ee3ea02e5c66b92b5965dcbe6fa76 (patch) | |
| tree | 61c083ae3b47a867cad3b31df7afde54a03a8161 | |
| parent | 2e297c1ec275c20602d5e48322613e88d8dbab13 (diff) | |
| parent | 245deb5cce916fb7a42c33cc98210ce5e4b6ed0a (diff) | |
| download | gitlab-ce-69d70400cc8ee3ea02e5c66b92b5965dcbe6fa76.tar.gz | |
Merge pull request #4076 from bke-drewb/4023
Fix regression caused by using newer version of Grape
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -41,8 +41,8 @@ gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib' gem "github-linguist", require: "linguist" # API -gem "grape" -gem "grape-entity" +gem "grape", "~> 0.3.1" +gem "grape-entity", "~> 0.2.0" # Format dates and times # based on human-friendly examples diff --git a/Gemfile.lock b/Gemfile.lock index 48be954c0c5..32745866b4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,7 +173,7 @@ GEM gon (4.1.0) actionpack (>= 2.3.0) json - grape (0.4.1) + grape (0.3.1) activesupport builder hashie (>= 1.2.0) @@ -183,7 +183,7 @@ GEM rack-accept rack-mount virtus - grape-entity (0.3.0) + grape-entity (0.2.0) activesupport multi_json (>= 1.3.2) growl (1.0.3) |