Commit 54d0453234ec4d5a307db88fa0eecc1e0cca7177
1 parent
8bc0a06c
Exists in
master
and in
4 other branches
Add tinder for future campfire integration
Showing
2 changed files
with
21 additions
and
1 deletions
Show diff stats
Gemfile
Gemfile.lock
| ... | ... | @@ -130,6 +130,8 @@ GEM |
| 130 | 130 | railties (>= 3.0.0) |
| 131 | 131 | faraday (0.8.7) |
| 132 | 132 | multipart-post (~> 1.1) |
| 133 | + faraday_middleware (0.9.0) | |
| 134 | + faraday (>= 0.7.4, < 0.9) | |
| 133 | 135 | faye-websocket (0.4.7) |
| 134 | 136 | eventmachine (>= 0.12.0) |
| 135 | 137 | ffaker (1.16.0) |
| ... | ... | @@ -214,7 +216,7 @@ GEM |
| 214 | 216 | activesupport (>= 3.1, < 4.1) |
| 215 | 217 | haml (>= 3.1, < 4.1) |
| 216 | 218 | railties (>= 3.1, < 4.1) |
| 217 | - hashie (2.0.4) | |
| 219 | + hashie (1.2.0) | |
| 218 | 220 | hike (1.2.2) |
| 219 | 221 | http_parser.rb (0.5.3) |
| 220 | 222 | httparty (0.11.0) |
| ... | ... | @@ -420,6 +422,7 @@ GEM |
| 420 | 422 | multi_json (~> 1) |
| 421 | 423 | redis (~> 3) |
| 422 | 424 | redis-namespace |
| 425 | + simple_oauth (0.1.9) | |
| 423 | 426 | simplecov (0.7.1) |
| 424 | 427 | multi_json (~> 1.0) |
| 425 | 428 | simplecov-html (~> 0.7.1) |
| ... | ... | @@ -461,11 +464,24 @@ GEM |
| 461 | 464 | thor (0.18.1) |
| 462 | 465 | tilt (1.3.7) |
| 463 | 466 | timers (1.1.0) |
| 467 | + tinder (1.9.2) | |
| 468 | + eventmachine (~> 1.0) | |
| 469 | + faraday (~> 0.8) | |
| 470 | + faraday_middleware (~> 0.9) | |
| 471 | + hashie (~> 1.0) | |
| 472 | + json (~> 1.7.5) | |
| 473 | + mime-types (~> 1.19) | |
| 474 | + multi_json (~> 1.5) | |
| 475 | + twitter-stream (~> 0.1) | |
| 464 | 476 | treetop (1.4.12) |
| 465 | 477 | polyglot |
| 466 | 478 | polyglot (>= 0.3.1) |
| 467 | 479 | turbolinks (1.1.1) |
| 468 | 480 | coffee-rails |
| 481 | + twitter-stream (0.1.16) | |
| 482 | + eventmachine (>= 0.12.8) | |
| 483 | + http_parser.rb (~> 0.5.1) | |
| 484 | + simple_oauth (~> 0.1.4) | |
| 469 | 485 | tzinfo (0.3.37) |
| 470 | 486 | uglifier (2.0.1) |
| 471 | 487 | execjs (>= 0.3.0) |
| ... | ... | @@ -570,6 +586,7 @@ DEPENDENCIES |
| 570 | 586 | test_after_commit |
| 571 | 587 | therubyracer |
| 572 | 588 | thin |
| 589 | + tinder (~> 1.9.2) | |
| 573 | 590 | turbolinks |
| 574 | 591 | uglifier |
| 575 | 592 | webmock | ... | ... |