diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-19 20:54:47 +0000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-12-19 22:13:08 +0000 |
| commit | 56fee39c392788314c44a575b3fd66e16a50c8b5 (patch) | |
| tree | e12603fff0d1e7c69d021f822b4077a74b91ddc4 /Gemfile | |
| parent | b225693a0d86f2e33c66049a69e5148e5c93b7cd (diff) | |
| download | rails-56fee39c392788314c44a575b3fd66e16a50c8b5.tar.gz rails-56fee39c392788314c44a575b3fd66e16a50c8b5.tar.bz2 rails-56fee39c392788314c44a575b3fd66e16a50c8b5.zip | |
Integrate Journey into Action Dispatch
Move the Journey code underneath the ActionDispatch namespace so
that we don't pollute the global namespace with names that may
be used for models.
Fixes rails/journey#49.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -13,10 +13,12 @@ gem 'turbolinks' gem 'coffee-rails', github: 'rails/coffee-rails' gem 'thread_safe', '~> 0.1' -gem 'journey', github: 'rails/journey', branch: 'master' gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders', branch: 'master' +# Needed for compiling the ActionDispatch::Journey parser +gem 'racc', '>=1.4.6', require: false + # This needs to be with require false to avoid # it being automatically loaded by sprockets gem 'uglifier', require: false |