Commit e85675b2
Changed files (1)
Gemfile.lock
@@ -1,50 +1,53 @@
GEM
remote: http://rubygems.org/
specs:
- RedCloth (4.2.8)
- actionmailer (3.1.2)
- actionpack (= 3.1.2)
- mail (~> 2.3.0)
- actionpack (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
+ RedCloth (4.2.9)
+ 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)
- i18n (~> 0.6)
- rack (~> 1.3.5)
- rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.0)
- activeadmin (0.3.4)
+ sprockets (~> 2.1.2)
+ activeadmin (0.4.3)
+ bourbon (>= 1.0.0)
devise (>= 1.1.2)
fastercsv
- formtastic (< 2.0.0)
- inherited_resources (< 1.3.0)
- kaminari (>= 0.12.4)
+ formtastic (>= 2.0.0)
+ inherited_resources (> 0)
+ jquery-rails (>= 1.0.0)
+ kaminari (>= 0.13.0)
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
- activemodel (3.1.2)
- activesupport (= 3.1.2)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- arel (~> 2.2.1)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- activesupport (3.1.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.6)
- ansi (1.4.1)
- arel (2.2.1)
+ addressable (2.2.7)
+ ansi (1.4.2)
+ arel (3.0.2)
bcrypt-ruby (3.0.1)
+ bourbon (1.4.0)
+ sass (>= 3.1)
builder (3.0.0)
- capistrano (2.9.0)
+ capistrano (2.12.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -59,86 +62,91 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- carrierwave (0.5.8)
- activesupport (~> 3.0)
- childprocess (0.2.2)
+ carrierwave (0.6.2)
+ activemodel (>= 3.2.0)
+ activesupport (>= 3.2.0)
+ childprocess (0.3.2)
ffi (~> 1.0.6)
- coffee-rails (3.1.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.3)
- devise (1.5.0)
+ coffee-script-source (1.3.1)
+ devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.1)
+ railties (~> 3.1)
+ warden (~> 1.1.1)
diff-lcs (1.1.3)
- em-websocket (0.3.5)
+ em-websocket (0.3.6)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.7.0)
eventmachine (0.12.10)
- exception_notification (2.5.2)
+ exception_notification (2.6.1)
actionmailer (>= 3.0.4)
- excon (0.7.6)
- execjs (1.2.9)
+ excon (0.13.4)
+ execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (2.2.0)
- activesupport
- factory_girl_rails (1.3.0)
- factory_girl (~> 2.2.0)
+ factory_girl (3.2.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (3.2.0)
+ factory_girl (~> 3.2.0)
railties (>= 3.0.0)
fastercsv (1.5.4)
ffi (1.0.11)
- fog (1.1.1)
+ fog (1.3.1)
builder
- excon (~> 0.7.4)
+ excon (~> 0.13.0)
formatador (~> 0.2.0)
mime-types
- multi_json (~> 1.0.3)
+ multi_json (~> 1.0)
net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.1)
- formtastic (1.2.4)
- actionpack (>= 2.3.7)
- activesupport (>= 2.3.7)
- i18n (~> 0.4)
+ formtastic (2.2.0)
+ actionpack (>= 3.0)
growl (1.0.3)
growl_notify (0.0.3)
rb-appscript
- guard (0.8.8)
+ guard (1.0.1)
+ ffi (>= 0.5.0)
thor (~> 0.14.6)
- guard-livereload (0.3.1)
+ guard-livereload (0.4.2)
em-websocket (>= 0.2.0)
- guard (>= 0.4.0)
- multi_json (~> 1.0.3)
- guard-rspec (0.5.4)
- guard (>= 0.8.4)
+ guard (>= 0.10.0)
+ multi_json (~> 1.0)
+ guard-rspec (0.7.0)
+ guard (>= 0.10.0)
has_scope (0.5.1)
- highline (1.6.8)
+ highline (1.6.11)
hike (1.2.1)
i18n (0.6.0)
- inherited_resources (1.2.2)
+ inherited_resources (1.3.1)
has_scope (~> 0.5.0)
- responders (~> 0.6.0)
+ responders (~> 0.6)
jasmine (1.1.2)
jasmine-core (>= 1.1.0)
rack (>= 1.1)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.1.0)
- jquery-rails (1.0.17)
- railties (~> 3.0)
+ journey (1.0.3)
+ jquery-rails (2.0.2)
+ railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.1)
- json_pure (1.6.1)
- kaminari (0.12.4)
- rails (>= 3.0.0)
- mail (2.3.0)
+ json (1.6.6)
+ kaminari (0.13.0)
+ actionpack (>= 3.0.0)
+ activesupport (>= 3.0.0)
+ railties (>= 3.0.0)
+ libwebsocket (0.1.3)
+ addressable
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -147,88 +155,87 @@ GEM
activerecord (~> 3.1)
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
- mime-types (1.17.2)
- multi_json (1.0.3)
+ mime-types (1.18)
+ multi_json (1.3.2)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.2.1)
+ net-ssh (2.3.0)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- nokogiri (1.5.0)
- orm_adapter (0.0.5)
- pg (0.11.0)
+ nokogiri (1.5.2)
+ orm_adapter (0.0.7)
+ pg (0.13.2)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
- rack (1.3.5)
- rack-cache (1.1)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.2)
- actionmailer (= 3.1.2)
- actionpack (= 3.1.2)
- activerecord (= 3.1.2)
- activeresource (= 3.1.2)
- activesupport (= 3.1.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.1.2)
- railties (3.1.2)
- actionpack (= 3.1.2)
- activesupport (= 3.1.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)
thor (~> 0.14.6)
rake (0.9.2.2)
rb-appscript (0.6.1)
- rb-fsevent (0.4.3.1)
- rdoc (3.11)
+ rb-fsevent (0.9.1)
+ rdoc (3.12)
json (~> 1.4)
- responders (0.6.5)
- riddle (1.5.0)
+ responders (0.9.1)
+ railties (~> 3.1)
+ riddle (1.5.1)
rmagick (2.13.1)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
+ rspec (2.9.0)
+ rspec-core (~> 2.9.0)
+ rspec-expectations (~> 2.9.0)
+ rspec-mocks (~> 2.9.0)
+ rspec-core (2.9.0)
+ rspec-expectations (2.9.1)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.9.0)
+ rspec-rails (2.9.0)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.9.0)
ruby-hmac (0.4.0)
ruby_gntp (0.3.4)
- rubyzip (0.9.4)
- sass (3.1.10)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
- selenium-webdriver (2.12.2)
- childprocess (>= 0.2.1)
- ffi (~> 1.0.9)
- json_pure
+ rubyzip (0.9.7)
+ sass (3.1.16)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ selenium-webdriver (2.21.2)
+ childprocess (>= 0.2.5)
+ ffi (~> 1.0)
+ libwebsocket (~> 0.1.3)
+ multi_json (~> 1.0)
rubyzip
- sprockets (2.1.0)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.4)
+ sqlite3 (1.3.6)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
- thinking-sphinx (2.0.10)
+ thinking-sphinx (2.0.11)
activerecord (>= 3.0.3)
builder (>= 2.1.2)
riddle (>= 1.5.0)
@@ -237,13 +244,13 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.8.3)
+ turn (0.9.5)
ansi
- tzinfo (0.3.31)
- uglifier (1.1.0)
+ tzinfo (0.3.33)
+ uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- warden (1.1.0)
+ warden (1.1.1)
rack (>= 1.0)
webrat (0.7.3)
nokogiri (>= 1.2.0)