diff --git a/Gemfile.lock b/Gemfile.lock index c6771e2..fd39be4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,31 +1,31 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.0) - actionpack (= 3.2.0) - mail (~> 2.4.0) - actionpack (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) + actionmailer (3.2.11) + actionpack (= 3.2.11) + mail (~> 2.4.4) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.0) + journey (~> 1.0.4) rack (~> 1.4.0) - rack-cache (~> 1.1) + rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.0) - activesupport (= 3.2.0) + sprockets (~> 2.2.1) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) - arel (~> 3.0.0) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) - activesupport (3.2.0) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) acts_as_commentable (4.0.0) @@ -83,6 +83,7 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + kgio (2.8.0) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -92,7 +93,7 @@ GEM compass (>= 0.12.1) sass (>= 3.2.0) sassy-math (>= 1.5) - multi_json (1.5.1) + multi_json (1.6.0) mysql2 (0.3.11) net-scp (1.1.0) net-ssh (>= 2.6.5) @@ -110,21 +111,22 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.0) - actionmailer (= 3.2.0) - actionpack (= 3.2.0) - activerecord (= 3.2.0) - activeresource (= 3.2.0) - activesupport (= 3.2.0) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.0) - railties (3.2.0) - actionpack (= 3.2.0) - activesupport (= 3.2.0) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) + thor (>= 0.14.6, < 2.0) + raindrops (0.10.0) rake (10.0.3) rdoc (3.12.1) json (~> 1.4) @@ -138,11 +140,12 @@ GEM tilt (~> 1.3) sassy-math (1.5) compass (~> 0.11) - sprockets (2.1.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thor (0.14.6) + thor (0.17.0) tilt (1.3.3) treetop (1.4.12) polyglot @@ -153,6 +156,10 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) + unicorn (4.6.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) warden (1.2.1) rack (>= 1.0) zurb-foundation (3.2.5) @@ -167,6 +174,7 @@ PLATFORMS DEPENDENCIES acts_as_commentable acts_as_tree + bcrypt-ruby (~> 3.0.0) capistrano carrierwave coffee-rails (~> 3.2.1) @@ -179,10 +187,11 @@ DEPENDENCIES jquery-rails kaminari mysql2 - rails (= 3.2.0) + rails (= 3.2.11) rmagick rvm-capistrano sass-rails (~> 3.2.3) turn (= 0.8.2) uglifier (>= 1.0.3) + unicorn zurb-foundation (>= 3.2) diff --git a/config/deploy.rb b/config/deploy.rb index 271e451..301602b 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -29,7 +29,7 @@ set :application, 'ecole_eft_app' role :db, domain, :primary => true set :scm, :git - set :repository, "git@gitlab.bally.me:root/ecole_eft.git" + set :repository, "git@gitlab.bally.me:root/ecole-eft.git" set :branch, "master" default_run_options[:pty] = true