sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update twitter gem from 1.6.0 to 2.5.0

Browse source
This commit is contained in:
Roland Jesse 2012-06-13 22:19:25 +02:00
parent eda82a620e
commit 8f25f4853b
2 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -23,7 +23,7 @@ gem 'cancan', '1.6.5'
gem 'capistrano', '2.5.21'
# https://github.com/jnunemaker/twitter
gem 'twitter', '1.6.0'
gem 'twitter', '2.5.0'
# Specify this directly in order to use version we also have @production site. Otherwise, 'rdoc' pulls newest version in.
gem 'json', '1.6.5'

42
Gemfile.lock
View file

@ -39,7 +39,6 @@ GEM
activesupport (3.2.5)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.7)
arel (3.0.2)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.2)
@ -59,27 +58,22 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.3.1)
coffee-script-source (1.3.3)
devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
railties (~> 3.1)
warden (~> 1.1.1)
erubis (2.7.0)
execjs (1.3.0)
execjs (1.4.0)
multi_json (~> 1.0)
faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
faraday_middleware (0.6.5)
faraday (~> 0.6.0)
fastercsv (1.5.4)
formtastic (2.2.0)
faraday (0.8.1)
multipart-post (~> 1.1)
fastercsv (1.5.5)
formtastic (2.2.1)
actionpack (>= 3.0)
has_scope (0.5.1)
hashie (1.0.0)
highline (1.6.11)
highline (1.6.12)
hike (1.2.1)
i18n (0.6.0)
inherited_resources (1.2.2)
@ -104,15 +98,14 @@ GEM
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
mime-types (1.18)
multi_json (1.0.4)
multi_xml (0.2.2)
multi_json (1.3.6)
multipart-post (1.1.5)
mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.3.0)
net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
orm_adapter (0.0.7)
@ -145,12 +138,12 @@ GEM
rdoc (3.12)
json (~> 1.4)
responders (0.6.5)
sass (3.1.15)
sass (3.1.19)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
simple_oauth (0.1.5)
simple_oauth (0.1.8)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
@ -160,13 +153,10 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
twitter (1.6.0)
faraday (~> 0.6.1)
faraday_middleware (~> 0.6.3)
hashie (~> 1.0.0)
multi_json (~> 1.0.0)
multi_xml (~> 0.2.0)
simple_oauth (~> 0.1.5)
twitter (2.5.0)
faraday (~> 0.8)
multi_json (~> 1.3)
simple_oauth (~> 0.1.6)
tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
@ -191,5 +181,5 @@ DEPENDENCIES
mysql2 (= 0.3.11)
rails (= 3.2.5)
sass-rails (= 3.2.5)
twitter (= 1.6.0)
twitter (= 2.5.0)
uglifier