Gemfile in basepack-0.2.0 vs Gemfile in basepack-1.0.0.pre.0

- old
+ new

@@ -1,13 +1,17 @@ source "https://rubygems.org" -ruby '2.0.0' +#ruby '2.1' # Declare your gem's dependencies in basepack.gemspec. # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. gemspec +#FIXME: forked version, waiting for #366 to be releaed. After that remove this line and use basepack.gemspec +gem 'inherited_resources', github: 'lksv/inherited_resources', branch: '#305_fetching_namespaced_model', ref: '93640c35200' +gem 'rails_admin', github: 'lksv/rails_admin', branch: 'cherrypick_2010', ref: '9595e19098c81c' + group :development do gem 'annotate' gem 'better_errors' # chrome extension rails_panel gem 'rails_panel' @@ -39,15 +43,15 @@ gem 'jquery-rails' gem "jquery-turbolinks" gem "turbolinks" gem "bootbox-rails" gem 'launchy' - gem "twitter-bootstrap-rails", "~> 2.2.8" + gem "twitter-bootstrap-rails", github: 'lksv/twitter-bootstrap-rails' #forked version - needs 95de3b0e (Fixed for Rails 4.1 and Ruby 2.1) to be releaed gem "selenium-webdriver" gem "simple_form" gem 'ancestry' gem 'jquery-cookie-rails' - gem 'fancytree-rails', "~> 0.0.2" + gem 'fancytree-rails', "~> 2.1.0-0" gem 'bootstrap-modal-rails' end # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or