Download as
Browse Code »

Commit 69d70400cc8ee3ea02e5c66b92b5965dcbe6fa76

Authored by Dmitriy Zaporozhets
2 parents 2e297c1e 245deb5c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4076 from bke-drewb/4023 

Fix regression caused by using newer version of Grape
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
@@ -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'
41 gem "github-linguist", require: "linguist" 41 gem "github-linguist", require: "linguist"
42 42
43 # API 43 # API
44 -gem "grape"  
45 -gem "grape-entity" 44 +gem "grape", "~> 0.3.1"
  45 +gem "grape-entity", "~> 0.2.0"
46 46
47 # Format dates and times 47 # Format dates and times
48 # based on human-friendly examples 48 # based on human-friendly examples
@@ -173,7 +173,7 @@ GEM @@ -173,7 +173,7 @@ GEM
173 gon (4.1.0) 173 gon (4.1.0)
174 actionpack (>= 2.3.0) 174 actionpack (>= 2.3.0)
175 json 175 json
176 - grape (0.4.1) 176 + grape (0.3.1)
177 activesupport 177 activesupport
178 builder 178 builder
179 hashie (>= 1.2.0) 179 hashie (>= 1.2.0)
@@ -183,7 +183,7 @@ GEM @@ -183,7 +183,7 @@ GEM
183 rack-accept 183 rack-accept
184 rack-mount 184 rack-mount
185 virtus 185 virtus
186 - grape-entity (0.3.0) 186 + grape-entity (0.2.0)
187 activesupport 187 activesupport
188 multi_json (>= 1.3.2) 188 multi_json (>= 1.3.2)
189 growl (1.0.3) 189 growl (1.0.3)