Commit 02c36601
Changed files (1)
Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.5)
- actionpack (= 3.2.5)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
mail (~> 2.4.4)
- actionpack (3.2.5)
- activemodel (= 3.2.5)
- activesupport (= 3.2.5)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
@@ -25,31 +25,31 @@ GEM
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
- activemodel (3.2.5)
- activesupport (= 3.2.5)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
- activerecord (3.2.5)
- activemodel (= 3.2.5)
- activesupport (= 3.2.5)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.5)
- activemodel (= 3.2.5)
- activesupport (= 3.2.5)
- activesupport (3.2.5)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_commentable_with_threading (1.1.2)
activerecord (>= 3.0)
activesupport (~> 3.0)
awesome_nested_set (>= 2.0)
- addressable (2.2.8)
+ addressable (2.3.1)
arel (3.0.2)
awesome_nested_set (2.1.3)
activerecord (>= 3.0.0)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.0.3.1)
- bourbon (2.1.0)
+ bootstrap-sass (2.0.4.0)
+ bourbon (2.1.1)
sass (>= 3.1)
builder (3.0.0)
capistrano (2.12.0)
@@ -73,8 +73,8 @@ GEM
carrierwave (0.6.2)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- childprocess (0.3.2)
- ffi (~> 1.0.6)
+ childprocess (0.3.4)
+ ffi (~> 1.0, >= 1.0.6)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -83,37 +83,37 @@ GEM
execjs
coffee-script-source (1.3.3)
developwithpassion_arrays (0.0.1)
- devise (2.1.0)
+ devise (2.1.2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.7)
+ orm_adapter (~> 0.1)
railties (~> 3.1)
- warden (~> 1.1.1)
+ warden (~> 1.2.1)
diff-lcs (1.1.3)
- em-websocket (0.3.6)
+ em-websocket (0.3.8)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.7.0)
eventmachine (0.12.10)
exception_notification (2.6.1)
actionmailer (>= 3.0.4)
- excon (0.13.4)
+ excon (0.14.3)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (3.4.0)
+ factory_girl (3.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.4.0)
- factory_girl (~> 3.4.0)
+ factory_girl_rails (3.5.0)
+ factory_girl (~> 3.5.0)
railties (>= 3.0.0)
- fakes (0.4.1)
+ fakes (1.0.2)
developwithpassion_arrays
- fakes-rspec (0.4.1)
+ fakes-rspec (1.0.2)
fakes
rspec
fastercsv (1.5.5)
- ffi (1.0.11)
- fog (1.3.1)
+ ffi (1.1.0)
+ fog (1.4.0)
builder
- excon (~> 0.13.0)
+ excon (~> 0.14.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
@@ -124,20 +124,20 @@ GEM
formatador (0.2.3)
formtastic (2.1.1)
actionpack (~> 3.0)
- guard (1.1.1)
+ guard (1.2.3)
listen (>= 0.4.2)
thor (>= 0.14.6)
guard-livereload (1.0.0)
em-websocket (>= 0.2.0)
guard (>= 1.1.0)
multi_json (~> 1.0)
- guard-rspec (1.0.0)
+ guard-rspec (1.2.0)
+ guard (>= 1.1)
+ guard-spork (1.1.0)
guard (>= 1.1)
- guard-spork (1.0.0)
- guard (>= 1.0.0)
spork (>= 0.8.4)
has_scope (0.5.1)
- highline (1.6.12)
+ highline (1.6.13)
hike (1.2.1)
i18n (0.6.0)
inherited_resources (1.3.1)
@@ -149,18 +149,18 @@ GEM
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.2.0)
- journey (1.0.3)
+ journey (1.0.4)
jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
+ railties (< 5.0, >= 3.2.0)
thor (~> 0.14)
- json (1.7.3)
+ json (1.7.4)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
- libwebsocket (0.1.3)
+ libwebsocket (0.1.4)
addressable
- listen (0.4.4)
+ listen (0.4.7)
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
@@ -173,7 +173,7 @@ GEM
activerecord (~> 3.1)
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
- mime-types (1.18)
+ mime-types (1.19)
multi_json (1.3.6)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@@ -182,10 +182,10 @@ GEM
net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- newrelic_rpm (3.3.5)
- nokogiri (1.5.4)
- orm_adapter (0.0.7)
- pg (0.13.2)
+ newrelic_rpm (3.4.0.1)
+ nokogiri (1.5.5)
+ orm_adapter (0.4.0)
+ pg (0.14.0)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
@@ -196,17 +196,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.5)
- actionmailer (= 3.2.5)
- actionpack (= 3.2.5)
- activerecord (= 3.2.5)
- activeresource (= 3.2.5)
- activesupport (= 3.2.5)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.2.5)
- railties (3.2.5)
- actionpack (= 3.2.5)
- activesupport (= 3.2.5)
+ railties (= 3.2.6)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -219,34 +219,33 @@ GEM
ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
- responders (0.9.1)
+ responders (0.9.2)
railties (~> 3.1)
rmagick (2.13.1)
- rspec (2.10.0)
- rspec-core (~> 2.10.0)
- rspec-expectations (~> 2.10.0)
- rspec-mocks (~> 2.10.0)
- rspec-core (2.10.1)
- rspec-expectations (2.10.0)
+ rspec (2.11.0)
+ rspec-core (~> 2.11.0)
+ rspec-expectations (~> 2.11.0)
+ rspec-mocks (~> 2.11.0)
+ rspec-core (2.11.1)
+ rspec-expectations (2.11.2)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.10.1)
- rspec-rails (2.10.1)
+ rspec-mocks (2.11.1)
+ rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.10.0)
+ rspec (~> 2.11.0)
ruby-hmac (0.4.0)
- rubyzip (0.9.8)
- rvm-capistrano (1.2.2)
+ rubyzip (0.9.9)
+ rvm-capistrano (1.2.5)
capistrano (>= 2.0.0)
- sass (3.1.19)
+ sass (3.1.20)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.22.2)
+ selenium-webdriver (2.25.0)
childprocess (>= 0.2.5)
- ffi (~> 1.0)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
@@ -254,21 +253,21 @@ GEM
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
+ tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.6)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
stringex (1.4.0)
- thor (0.15.2)
+ thor (0.15.4)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
- uglifier (1.2.4)
+ uglifier (1.2.6)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- warden (1.1.1)
+ multi_json (~> 1.3)
+ warden (1.2.1)
rack (>= 1.0)
webrat (0.7.3)
nokogiri (>= 1.2.0)