* Removed Pixa/Tinami sources
* Upgraded to Rails 3.2.3 * Fixed tests
This commit is contained in:
110
Gemfile.lock
110
Gemfile.lock
@@ -22,91 +22,91 @@ GIT
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rgrove/sanitize.git
|
||||
revision: 052abea134e409c7f676f0cf56e6a2315b2a150b
|
||||
revision: 4925ac8058320fa587b6bdd7556fdf76e2ad5d31
|
||||
specs:
|
||||
sanitize (2.0.3)
|
||||
nokogiri (>= 1.4.4, < 1.6)
|
||||
|
||||
GIT
|
||||
remote: http://github.com/EmmanuelOga/ffaker.git
|
||||
revision: a2bff9d77503a9cf61eb274725b12e5683b2826c
|
||||
revision: 8f7c679ec8c3d27aefe287e04e48e2702b865df9
|
||||
specs:
|
||||
ffaker (1.13.0)
|
||||
ffaker (1.14.0)
|
||||
|
||||
GEM
|
||||
remote: http://gemcutter.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)
|
||||
arel (3.0.2)
|
||||
awesome_print (1.0.2)
|
||||
builder (3.0.0)
|
||||
chronic (0.6.7)
|
||||
coderay (1.0.5)
|
||||
coderay (1.0.6)
|
||||
daemons (1.1.8)
|
||||
delayed_job (3.0.1)
|
||||
delayed_job (3.0.3)
|
||||
activesupport (~> 3.0)
|
||||
delayed_job_active_record (0.3.2)
|
||||
activerecord (> 2.1.0)
|
||||
delayed_job (~> 3.0.0)
|
||||
domain_name (0.5.2)
|
||||
domain_name (0.5.3)
|
||||
unf (~> 0.0.3)
|
||||
erubis (2.7.0)
|
||||
execjs (1.3.0)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
factory_girl (2.6.3)
|
||||
activesupport (>= 2.3.9)
|
||||
factory_girl (3.3.0)
|
||||
activesupport (>= 3.0.0)
|
||||
hike (1.2.1)
|
||||
i18n (0.6.0)
|
||||
journey (1.0.3)
|
||||
json (1.6.5)
|
||||
json (1.7.3)
|
||||
libv8 (3.3.10.4)
|
||||
mail (2.4.3)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
memcache-client (1.8.5)
|
||||
metaclass (0.0.1)
|
||||
method_source (0.7.1)
|
||||
mime-types (1.17.2)
|
||||
mocha (0.10.5)
|
||||
mime-types (1.18)
|
||||
mocha (0.11.4)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.1.0)
|
||||
net-http-digest_auth (1.2)
|
||||
net-http-persistent (2.5.2)
|
||||
newrelic_rpm (3.3.4.1)
|
||||
nokogiri (1.5.2)
|
||||
multi_json (1.3.6)
|
||||
net-http-digest_auth (1.2.1)
|
||||
net-http-persistent (2.6)
|
||||
newrelic_rpm (3.3.5)
|
||||
nokogiri (1.5.3)
|
||||
ntlm-http (0.1.1)
|
||||
pg (0.13.2)
|
||||
polyamorous (0.5.0)
|
||||
activerecord (~> 3.0)
|
||||
polyglot (0.3.3)
|
||||
pry (0.9.8.4)
|
||||
pry (0.9.9.6)
|
||||
coderay (~> 1.0.5)
|
||||
method_source (~> 0.7.1)
|
||||
slop (>= 2.4.4, < 3)
|
||||
@@ -117,17 +117,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)
|
||||
@@ -136,8 +136,8 @@ GEM
|
||||
rdoc (3.12)
|
||||
json (~> 1.4)
|
||||
rmagick (2.13.1)
|
||||
sass (3.1.15)
|
||||
sass-rails (3.2.4)
|
||||
sass (3.1.19)
|
||||
sass-rails (3.2.5)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
@@ -146,35 +146,35 @@ GEM
|
||||
shoulda-matchers (~> 1.0.0)
|
||||
shoulda-context (1.0.0)
|
||||
shoulda-matchers (1.0.0)
|
||||
simple_form (2.0.1)
|
||||
simple_form (2.0.2)
|
||||
actionpack (~> 3.0)
|
||||
activemodel (~> 3.0)
|
||||
simplecov (0.6.1)
|
||||
simplecov (0.6.4)
|
||||
multi_json (~> 1.0)
|
||||
simplecov-html (~> 0.5.3)
|
||||
simplecov-html (0.5.3)
|
||||
slop (2.4.4)
|
||||
sprockets (2.1.2)
|
||||
sprockets (2.1.3)
|
||||
hike (~> 1.2)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
super_exception_notifier (3.0.13)
|
||||
actionmailer
|
||||
rake
|
||||
therubyracer (0.9.10)
|
||||
therubyracer (0.10.1)
|
||||
libv8 (~> 3.3.10)
|
||||
thor (0.14.6)
|
||||
tilt (1.3.3)
|
||||
treetop (1.4.10)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.32)
|
||||
uglifier (1.2.3)
|
||||
tzinfo (0.3.33)
|
||||
uglifier (1.2.4)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (>= 1.0.2)
|
||||
unf (0.0.5)
|
||||
unf_ext
|
||||
unf_ext (0.0.4)
|
||||
unf_ext (0.0.5)
|
||||
webrobots (0.0.13)
|
||||
whenever (0.7.3)
|
||||
activesupport (>= 2.3.4)
|
||||
@@ -198,7 +198,7 @@ DEPENDENCIES
|
||||
nokogiri
|
||||
pg
|
||||
pry
|
||||
rails (= 3.2.2)
|
||||
rails (= 3.2.3)
|
||||
rmagick
|
||||
sanitize!
|
||||
sass-rails
|
||||
|
||||
Reference in New Issue
Block a user