Commit befb344427c31130c1f94d666e5dfd207f4c851a
1 parent
b91bddf9
Exists in
staging
and in
4 other branches
HOTSPOT: updating gemfile.lock
Showing
1 changed file
with
14 additions
and
0 deletions
Show diff stats
Gemfile.lock
... | ... | @@ -39,6 +39,8 @@ GEM |
39 | 39 | multi_json (~> 1.0) |
40 | 40 | acts-as-taggable-on (3.4.4) |
41 | 41 | activerecord (>= 3.2, < 5) |
42 | + addressable (2.3.8) | |
43 | + ambry (0.3.1) | |
42 | 44 | api-pagination (4.1.1) |
43 | 45 | arel (3.0.3) |
44 | 46 | axiom-types (0.1.1) |
... | ... | @@ -57,6 +59,8 @@ GEM |
57 | 59 | chronic (0.10.2) |
58 | 60 | coercible (1.0.0) |
59 | 61 | descendants_tracker (~> 0.0.1) |
62 | + crack (0.4.2) | |
63 | + safe_yaml (~> 1.0.0) | |
60 | 64 | cucumber (1.0.6) |
61 | 65 | builder (>= 2.1.2) |
62 | 66 | diff-lcs (>= 1.1.2) |
... | ... | @@ -119,6 +123,8 @@ GEM |
119 | 123 | mail (2.5.4) |
120 | 124 | mime-types (~> 1.16) |
121 | 125 | treetop (~> 1.4.8) |
126 | + merit (2.3.2) | |
127 | + ambry (~> 0.3.0) | |
122 | 128 | metaclass (0.0.4) |
123 | 129 | mime-types (1.25.1) |
124 | 130 | mini_portile (0.6.2) |
... | ... | @@ -206,6 +212,7 @@ GEM |
206 | 212 | ruby-feedparser (0.9.3) |
207 | 213 | magic |
208 | 214 | rubyzip (1.1.7) |
215 | + safe_yaml (1.0.4) | |
209 | 216 | sass (3.4.15) |
210 | 217 | sass-rails (3.2.6) |
211 | 218 | railties (~> 3.2.0) |
... | ... | @@ -238,11 +245,15 @@ GEM |
238 | 245 | uglifier (2.7.1) |
239 | 246 | execjs (>= 0.3.0) |
240 | 247 | json (>= 1.8.0) |
248 | + vcr (2.9.3) | |
241 | 249 | virtus (1.0.5) |
242 | 250 | axiom-types (~> 0.1) |
243 | 251 | coercible (~> 1.0) |
244 | 252 | descendants_tracker (~> 0.0, >= 0.0.3) |
245 | 253 | equalizer (~> 0.0, >= 0.0.9) |
254 | + webmock (1.21.0) | |
255 | + addressable (>= 2.3.6) | |
256 | + crack (>= 0.3.2) | |
246 | 257 | websocket (1.0.7) |
247 | 258 | whenever (0.9.4) |
248 | 259 | chronic (>= 0.6.3) |
... | ... | @@ -272,6 +283,7 @@ DEPENDENCIES |
272 | 283 | grape_logging! |
273 | 284 | liquid (~> 3.0.3) |
274 | 285 | locale (~> 2.0.5) |
286 | + merit (~> 2.3.1) | |
275 | 287 | minitest (~> 3.2.0) |
276 | 288 | mocha (~> 1.1.0) |
277 | 289 | nokogiri (~> 1.6.0) |
... | ... | @@ -293,5 +305,7 @@ DEPENDENCIES |
293 | 305 | selenium-webdriver (~> 2.39.0) |
294 | 306 | thin (~> 1.3.1) |
295 | 307 | uglifier (>= 1.0.3) |
308 | + vcr | |
309 | + webmock | |
296 | 310 | whenever |
297 | 311 | will_paginate (~> 3.0.3) | ... | ... |