Updated Gemfile with latest tumblr
Earlier fork of tumblr has been merged and deleted; this commit points the Gemfile to the official tumblr-client that includes the previous forked version's fix for faraday_middleware
Dustin Miller
共有 2 个文件被更改，包括 11 次插入 和 17 次删除
+ 2
- 2
Gemfile
@@ -29,7 +29,7 @@ gem 'twitter-stream', github: 'cantino/twitter-stream', branch: 'huginn' |
||
| 29 | 29 |
gem 'omniauth-twitter' |
| 30 | 30 |
|
| 31 | 31 |
# Tumblr Agents |
| 32 |
-gem 'tumblr_client', github: 'knu/tumblr_client', branch: 'patch-1' |
|
| 32 |
+gem 'tumblr_client' |
|
| 33 | 33 |
gem 'omniauth-tumblr' |
| 34 | 34 |
|
| 35 | 35 |
# Dropbox Agents |
@@ -67,7 +67,7 @@ gem 'devise', '~> 3.4.0' |
||
| 67 | 67 |
gem 'dotenv-rails', '~> 2.0.1' |
| 68 | 68 |
gem 'em-http-request', '~> 1.1.2' |
| 69 | 69 |
gem 'faraday', '~> 0.9.0' |
| 70 |
-gem 'faraday_middleware', '>= 0.10.0' |
|
| 70 |
+gem 'faraday_middleware' |
|
| 71 | 71 |
gem 'feed-normalizer' |
| 72 | 72 |
gem 'font-awesome-sass', '~> 4.3.2' |
| 73 | 73 |
gem 'foreman', '~> 0.63.0' |
+ 9
- 15
Gemfile.lock
@@ -20,19 +20,6 @@ GIT |
||
| 20 | 20 |
rest-client (~> 1.8) |
| 21 | 21 |
|
| 22 | 22 |
GIT |
| 23 |
- remote: git://github.com/knu/tumblr_client.git |
|
| 24 |
- revision: d6f1f64a7cba381345c588e28ebcff28048c3a6c |
|
| 25 |
- branch: patch-1 |
|
| 26 |
- specs: |
|
| 27 |
- tumblr_client (0.8.5) |
|
| 28 |
- faraday (~> 0.9.0) |
|
| 29 |
- faraday_middleware (~> 0.9) |
|
| 30 |
- json |
|
| 31 |
- mime-types |
|
| 32 |
- oauth |
|
| 33 |
- simple_oauth |
|
| 34 |
- |
|
| 35 |
-GIT |
|
| 36 | 23 |
remote: git://github.com/wunderlist/omniauth-wunderlist.git |
| 37 | 24 |
revision: d0910d0396107b9302aa1bc50e74bb140990ccb8 |
| 38 | 25 |
ref: d0910d0396107b9302aa1bc50e74bb140990ccb8 |
@@ -485,6 +472,13 @@ GEM |
||
| 485 | 472 |
tins (1.3.2) |
| 486 | 473 |
treetop (1.5.3) |
| 487 | 474 |
polyglot (~> 0.3) |
| 475 |
+ tumblr_client (0.8.2) |
|
| 476 |
+ faraday (>= 0.8) |
|
| 477 |
+ faraday_middleware (>= 0.8) |
|
| 478 |
+ json |
|
| 479 |
+ mime-types |
|
| 480 |
+ oauth |
|
| 481 |
+ simple_oauth |
|
| 488 | 482 |
twilio-ruby (3.11.6) |
| 489 | 483 |
builder (>= 2.1.2) |
| 490 | 484 |
jwt (>= 0.1.2) |
@@ -553,7 +547,7 @@ DEPENDENCIES |
||
| 553 | 547 |
em-http-request (~> 1.1.2) |
| 554 | 548 |
evernote_oauth |
| 555 | 549 |
faraday (~> 0.9.0) |
| 556 |
- faraday_middleware (>= 0.10.0) |
|
| 550 |
+ faraday_middleware |
|
| 557 | 551 |
feed-normalizer |
| 558 | 552 |
ffi (>= 1.9.4) |
| 559 | 553 |
font-awesome-sass (~> 4.3.2) |
@@ -611,7 +605,7 @@ DEPENDENCIES |
||
| 611 | 605 |
spectrum-rails |
| 612 | 606 |
string-scrub |
| 613 | 607 |
therubyracer (~> 0.12.2) |
| 614 |
- tumblr_client! |
|
| 608 |
+ tumblr_client |
|
| 615 | 609 |
twilio-ruby (~> 3.11.5) |
| 616 | 610 |
twitter (~> 5.14.0) |
| 617 | 611 |
twitter-stream! |