diff --git a/Gemfile.lock b/Gemfile.lock index 19235a7..aadbc47 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: git://github.com/justinfrench/formtastic.git - revision: 58ef0ee246bb2aa4e32f19faab8d737f6c3ab963 + revision: cd6cb88f28ea7444267802ced8e5ec0f5cfd0f90 specs: - formtastic (2.2.1) + formtastic (2.3.0.rc2) actionpack (>= 3.0) GEM @@ -71,7 +71,7 @@ GEM i18n (0.6.4) jbuilder (1.0.2) activesupport (>= 3.0.0) - jquery-rails (3.0.2) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.0) @@ -92,10 +92,10 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.23) - mini_portile (0.5.0) + mini_portile (0.5.1) minitest (4.7.5) multi_json (1.7.7) - mysql2 (0.3.12) + mysql2 (0.3.13) net-scp (1.1.2) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -128,7 +128,7 @@ GEM json (~> 1.4) ref (1.0.5) rmagick (2.13.2) - rvm-capistrano (1.3.4) + rvm-capistrano (1.4.1) capistrano (>= 2.0.0) sdoc (0.3.20) json (>= 1.1.3) @@ -153,7 +153,7 @@ GEM treetop (1.4.14) polyglot polyglot (>= 0.3.1) - turbolinks (1.2.0) + turbolinks (1.3.0) coffee-rails twitter-bootstrap-rails (2.2.7) actionpack (>= 3.1) @@ -161,7 +161,7 @@ GEM rails (>= 3.1) railties (>= 3.1) tzinfo (0.3.37) - uglifier (2.1.1) + uglifier (2.1.2) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) unicorn (4.6.3) diff --git a/config/deploy.rb b/config/deploy.rb index 1947a94..d87110f 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -33,7 +33,7 @@ role :db, domain, :primary => true set :scm, :git -set :repository, "#{scm_user}@#{scm_host}:root/#{application}.git" +set :repository, "#{scm_user}@#{scm_host}:root/ecole-eft.git" set :branch, "master"