From b8bab889a546222f9d35e87ca828e246c2058c10 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 27 May 2013 09:24:09 +0200 Subject: [PATCH] Prepared for rails 4. --- Gemfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Gemfile b/Gemfile index 831104e5c..04c907f93 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,11 @@ source 'http://rubygems.org' gem 'rails', '3.2.13' +# preparation for rails 4 +#gem 'rails', '4.0.0.rc1' +#gem 'rails-observers' +#gem 'activerecord-session_store' + # Bundle edge Rails instead: #gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -10,6 +15,10 @@ gem 'json' # Gems used only for assets and not required # in production environments by default. group :assets do + +# preparation for rails 4 +# gem 'sass-rails', '~> 4.0.0.rc1' +# gem 'coffee-rails', '~> 4.0.0.rc1' gem 'sass-rails', '~> 3.2.4' gem 'coffee-rails', '~> 3.2.2' gem 'uglifier', '>= 1.2.3' @@ -46,6 +55,11 @@ gem 'simple-rss' gem 'mysql2' #gem 'sqlite3' +#platforms :jruby do +# gem 'jruby-openssl' +# gem 'activerecord-jdbcmysql-adapter' +#end + gem 'net-ldap' # Use unicorn as the web server