diff options
| author | Marc Florisson | 2012-09-03 13:42:13 +0200 |
|---|---|---|
| committer | Marc Florisson | 2012-09-03 13:42:13 +0200 |
| commit | 58438f69e471bcd6c110d6a0dd707f593cfd2162 (patch) | |
| tree | 0e32da4f52c39c7eac999ae34df97dad657edfdb | |
| parent | 95cd8ec1f5e4ef9372e21c0940a71ac916ed99e0 (diff) | |
| download | chouette-core-58438f69e471bcd6c110d6a0dd707f593cfd2162.tar.bz2 | |
retore Gemfile.lock, update routes for subscription
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e7072b52e..63ab2fda8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,6 @@ GEM remote: http://rubygems.org/ specs: GeoRuby (1.3.4) - RedCloth (4.2.9) RedCloth (4.2.9-java) SyslogLogger (1.4.1) actionmailer (3.2.6) @@ -106,7 +105,6 @@ GEM acts_as_list (0.1.6) addressable (2.2.8) arel (3.0.2) - bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-java) bouncy-castle-java (1.5.0146.1) builder (3.0.0) @@ -160,7 +158,6 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) - ffi (1.0.11) ffi (1.0.11-java) ffi-geos (0.0.6) ffi (>= 1.0.0) @@ -197,8 +194,6 @@ GEM jruby-rack (>= 1.1.1) json (1.7.5-java) json_pure (1.7.5) - launchy (2.1.0) - addressable (~> 2.2.6) launchy (2.1.0-java) addressable (~> 2.2.6) ffi (~> 1.0.9) @@ -224,7 +219,6 @@ GEM net-ssh (2.5.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) - nokogiri (1.5.5) nokogiri (1.5.5-java) orm_adapter (0.4.0) polyamorous (0.5.0) diff --git a/config/routes.rb b/config/routes.rb index 53c5f89d3..6f51978a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ ChouetteIhm::Application.routes.draw do devise_for :users do - match "/users/sign_up" => redirect("/subscription/new") + match "/users/sign_up" => "subscriptions#new" end resource :subscription |