Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moved to rails 3.2.3.

Browse source
This commit is contained in:
Martin Edenhofer 2012-05-22 22:03:20 +02:00
parent 940811a377
commit 4e7387fdda
2 changed files with 64 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -1,6 +1,6 @@
source 'http://rubygems.org'
gem 'rails', '3.2.2'
gem 'rails', '3.2.3'
# Bundle edge Rails instead:
#gem 'rails', :git => 'git://github.com/rails/rails.git'
@ -47,7 +47,7 @@ gem 'simple-rss'
# gem 'therubyracer'
# e. g. for mysql you need to load mysql
# gem 'mysql'
# gem 'mysql2'
# Use unicorn as the web server
# gem 'unicorn'

120
Gemfile.lock
View file

@ -1,34 +1,33 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.2)
actionpack (= 3.2.2)
mail (~> 2.4.0)
actionpack (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
actionmailer (3.2.3)
actionpack (= 3.2.3)
mail (~> 2.4.4)
actionpack (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activemodel (3.2.2)
activesupport (= 3.2.2)
activemodel (3.2.3)
activesupport (= 3.2.3)
builder (~> 3.0.0)
activerecord (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activerecord (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activesupport (3.2.2)
activeresource (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.7)
arel (3.0.2)
builder (3.0.0)
coffee-rails (3.2.2)
@ -37,9 +36,9 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.2.0)
coffee-script-source (1.3.3)
daemons (1.1.8)
delayed_job (3.0.1)
delayed_job (3.0.2)
activesupport (~> 3.0)
delayed_job_active_record (0.3.2)
activerecord (> 2.1.0)
@ -50,51 +49,54 @@ GEM
execjs
eco-source (1.1.0.rc.1)
erubis (2.7.0)
execjs (1.3.0)
execjs (1.4.0)
multi_json (~> 1.0)
faraday (0.7.6)
addressable (~> 2.2)
faraday (0.8.0)
multipart-post (~> 1.1)
rack (~> 1.1)
hashie (1.2.0)
hike (1.2.1)
httpauth (0.1)
i18n (0.6.0)
journey (1.0.3)
jquery-rails (2.0.1)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.6.6)
koala (1.3.0)
faraday (~> 0.7.0)
json (1.7.3)
json (1.7.3-java)
koala (1.1.0)
multi_json (~> 1.0)
multipart-post (~> 1.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
multi_json (1.2.0)
multi_json (1.3.5)
multipart-post (1.1.5)
oauth (0.4.5)
oauth2 (0.5.2)
mysql2 (0.3.11)
oauth (0.4.6)
oauth2 (0.6.1)
faraday (~> 0.7)
multi_json (~> 1.0)
omniauth (1.0.2)
httpauth (~> 0.1)
multi_json (~> 1.3)
omniauth (1.1.0)
hashie (~> 1.2)
rack
omniauth-facebook (1.2.0)
omniauth-oauth2 (~> 1.0.0)
omniauth-facebook (1.3.0)
omniauth-oauth2 (~> 1.0.2)
omniauth-google-oauth2 (0.1.9)
omniauth (~> 1.0)
omniauth-oauth2
omniauth-linkedin (0.0.6)
omniauth-oauth (~> 1.0.0)
omniauth-oauth (1.0.0)
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.0.0)
oauth2 (~> 0.5.0)
omniauth-oauth2 (1.0.2)
oauth2 (~> 0.6.0)
omniauth (~> 1.0)
omniauth-twitter (0.0.8)
omniauth-twitter (0.0.11)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
polyglot (0.3.3)
rack (1.4.1)
@ -104,17 +106,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.2.2)
actionmailer (= 3.2.2)
actionpack (= 3.2.2)
activerecord (= 3.2.2)
activeresource (= 3.2.2)
activesupport (= 3.2.2)
rails (3.2.3)
actionmailer (= 3.2.3)
actionpack (= 3.2.3)
activerecord (= 3.2.3)
activeresource (= 3.2.3)
activesupport (= 3.2.3)
bundler (~> 1.0)
railties (= 3.2.2)
railties (3.2.2)
actionpack (= 3.2.2)
activesupport (= 3.2.2)
railties (= 3.2.3)
railties (3.2.3)
actionpack (= 3.2.3)
activesupport (= 3.2.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@ -122,34 +124,35 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
sass (3.1.15)
sass (3.1.18)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
simple-rss (1.2.3)
simple_oauth (0.1.5)
sprockets (2.1.2)
simple_oauth (0.1.8)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
sqlite3 (1.3.6)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
twitter (2.1.0)
twitter (2.4.0)
activesupport (>= 2.3.9, < 4)
faraday (~> 0.7)
multi_json (~> 1.0)
simple_oauth (~> 0.1)
tzinfo (0.3.32)
faraday (~> 0.8)
multi_json (~> 1.3)
simple_oauth (~> 0.1.6)
tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
PLATFORMS
java
ruby
DEPENDENCIES
@ -162,12 +165,13 @@ DEPENDENCIES
koala
mail
mime-types
mysql2
omniauth
omniauth-facebook
omniauth-google-oauth2
omniauth-linkedin
omniauth-twitter
rails (= 3.2.2)
rails (= 3.2.3)
sass-rails (~> 3.2.4)
simple-rss
sqlite3