diff --git a/Gemfile b/Gemfile index 9adf4ed1..42886f75 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,7 @@ gem 'prawn-table' gem 'haml-rails' gem 'kaminari' gem 'simple_form' +gem 'inherited_resources', git: 'git://github.com/josevalim/inherited_resources.git', branch: 'rails-4-2' gem 'localize_input', git: "git://github.com/bennibu/localize_input.git" gem 'daemons' gem 'twitter-bootstrap-rails', '~> 2.2.8' diff --git a/Gemfile.lock b/Gemfile.lock index df33b277..4336c46c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,6 +4,17 @@ GIT specs: localize_input (0.1.0) +GIT + remote: git://github.com/josevalim/inherited_resources.git + revision: ff1c991307ff78cce98882b6986aeabbbcfd70c4 + branch: rails-4-2 + specs: + inherited_resources (1.5.1) + actionpack (>= 3.2, < 5) + has_scope (~> 0.6.0.rc) + railties (>= 3.2, < 5) + responders + GIT remote: git://github.com/technoweenie/acts_as_versioned.git revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b @@ -168,6 +179,9 @@ GEM haml (>= 3.1, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) + has_scope (0.6.0.rc) + actionpack (>= 3.2, < 5) + activesupport (>= 3.2, < 5) hike (1.2.3) hpricot (0.8.6) html2haml (1.0.1) @@ -305,6 +319,8 @@ GEM redis-namespace (1.5.1) redis (~> 3.0, >= 3.0.4) ref (1.0.5) + responders (2.0.2) + railties (>= 4.2.0.alpha, < 5) resque (1.25.2) mono_logger (~> 1.0) multi_json (~> 1.0) @@ -466,6 +482,7 @@ DEPENDENCIES i18n-js (~> 3.0.0.rc8) i18n-spec ice_cube! + inherited_resources! jquery-rails kaminari less-rails