Commit f672c74c
Changed files (1)
Gemfile.lock
@@ -14,11 +14,12 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
- activeadmin (0.4.4)
+ activeadmin (0.5.0)
+ arbre (>= 1.0.1)
bourbon (>= 1.0.0)
devise (>= 1.1.2)
fastercsv
- formtastic (~> 2.1.1)
+ formtastic (>= 2.0.0)
inherited_resources (>= 1.3.1)
jquery-rails (>= 1.0.0)
kaminari (>= 0.13.0)
@@ -44,15 +45,17 @@ GEM
activesupport (~> 3.0)
awesome_nested_set (>= 2.0)
addressable (2.3.2)
+ arbre (1.0.1)
+ activesupport (>= 3.0.0)
arel (3.0.2)
- awesome_nested_set (2.1.3)
+ awesome_nested_set (2.1.4)
activerecord (>= 3.0.0)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.0.4.0)
+ bootstrap-sass (2.1.0.0)
bourbon (2.1.1)
sass (>= 3.1)
- builder (3.0.0)
- capistrano (2.12.0)
+ builder (3.0.3)
+ capistrano (2.13.3)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -93,16 +96,16 @@ GEM
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.7.0)
- eventmachine (0.12.10)
+ eventmachine (1.0.0)
exception_notification (2.6.1)
actionmailer (>= 3.0.4)
- excon (0.16.0)
+ excon (0.16.2)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (4.0.0)
+ factory_girl (4.1.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.0.0)
- factory_girl (~> 4.0.0)
+ factory_girl_rails (4.1.0)
+ factory_girl (~> 4.1.0)
railties (>= 3.0.0)
fakes (1.0.2)
developwithpassion_arrays
@@ -122,9 +125,9 @@ GEM
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.3)
- formtastic (2.1.1)
- actionpack (~> 3.0)
- guard (1.3.1)
+ formtastic (2.2.1)
+ actionpack (>= 3.0)
+ guard (1.3.2)
listen (>= 0.4.2)
thor (>= 0.14.6)
guard-livereload (1.0.0)
@@ -133,37 +136,35 @@ GEM
multi_json (~> 1.0)
guard-rspec (1.2.1)
guard (>= 1.1)
- guard-spork (1.1.0)
+ guard-spork (1.2.0)
+ childprocess
guard (>= 1.1)
spork (>= 0.8.4)
+ sys-proctable
has_scope (0.5.1)
- highline (1.6.13)
+ highline (1.6.14)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
- jasmine (1.2.0)
+ jasmine (1.2.1)
jasmine-core (>= 1.2.0)
rack (~> 1.0)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.2.0)
journey (1.0.4)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
+ jquery-rails (2.1.2)
+ railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- json (1.7.4)
- kaminari (0.13.0)
+ json (1.7.5)
+ kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- railties (>= 3.0.0)
libwebsocket (0.1.5)
addressable
- listen (0.4.7)
- rb-fchange (~> 0.0.5)
- rb-fsevent (~> 0.9.1)
- rb-inotify (~> 0.8.8)
+ listen (0.5.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -182,10 +183,10 @@ GEM
net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- newrelic_rpm (3.4.1)
+ newrelic_rpm (3.4.2)
nokogiri (1.5.5)
orm_adapter (0.4.0)
- pg (0.14.0)
+ pg (0.14.1)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
@@ -212,11 +213,6 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
- rb-fchange (0.0.5)
- ffi
- rb-fsevent (0.9.1)
- rb-inotify (0.8.8)
- ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
responders (0.9.2)
@@ -227,7 +223,7 @@ GEM
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
- rspec-expectations (2.11.2)
+ rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.2)
rspec-rails (2.11.0)
@@ -237,9 +233,9 @@ GEM
rspec (~> 2.11.0)
ruby-hmac (0.4.0)
rubyzip (0.9.9)
- rvm-capistrano (1.2.5)
+ rvm-capistrano (1.2.7)
capistrano (>= 2.0.0)
- sass (3.2.0)
+ sass (3.2.1)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -258,15 +254,16 @@ GEM
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
stringex (1.4.0)
+ sys-proctable (0.9.1)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
- uglifier (1.2.7)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (~> 1.3)
+ multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1)
rack (>= 1.0)
webrat (0.7.3)