Merge pull request #4076 from bke-drewb/4023

Fix regression caused by using newer version of Grape

Merge pull request #4076 from bke-drewb/4023
Fix regression caused by using newer version of Grape
Dmitriy Zaporozhets
2 parents 2e297c1e 245deb5c
Showing 2 changed files with 4 additions and 4 deletions Show diff stats
Gemfile
Gemfile.lock
@@ -41,8 +41,8 @@ gem &quot;gitlab-gollum-lib&quot;, &quot;~&gt; 1.0.0&quot;, require: &#39;gollum-lib&#39;
 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
@@ -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)
...	...	@@ -41,8 +41,8 @@ gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib'
41	41	gem "github-linguist", require: "linguist"
42	42
43	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	47	# Format dates and times
48	48	# based on human-friendly examples
...	...
...	...	@@ -173,7 +173,7 @@ GEM
173	173	gon (4.1.0)
174	174	actionpack (>= 2.3.0)
175	175	json
176		- grape (0.4.1)
	176	+ grape (0.3.1)
177	177	activesupport
178	178	builder
179	179	hashie (>= 1.2.0)
...	...	@@ -183,7 +183,7 @@ GEM
183	183	rack-accept
184	184	rack-mount
185	185	virtus
186		- grape-entity (0.3.0)
	186	+ grape-entity (0.2.0)
187	187	activesupport
188	188	multi_json (>= 1.3.2)
189	189	growl (1.0.3)
...	...