Prepared for rails 4.

This commit is contained in:
Martin Edenhofer 2013-05-27 09:24:09 +02:00
parent 3d820fa1d3
commit b8bab889a5

14
Gemfile
View file

@ -2,6 +2,11 @@ source 'http://rubygems.org'
gem 'rails', '3.2.13' 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: # Bundle edge Rails instead:
#gem 'rails', :git => 'git://github.com/rails/rails.git' #gem 'rails', :git => 'git://github.com/rails/rails.git'
@ -10,6 +15,10 @@ gem 'json'
# Gems used only for assets and not required # Gems used only for assets and not required
# in production environments by default. # in production environments by default.
group :assets do 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 'sass-rails', '~> 3.2.4'
gem 'coffee-rails', '~> 3.2.2' gem 'coffee-rails', '~> 3.2.2'
gem 'uglifier', '>= 1.2.3' gem 'uglifier', '>= 1.2.3'
@ -46,6 +55,11 @@ gem 'simple-rss'
gem 'mysql2' gem 'mysql2'
#gem 'sqlite3' #gem 'sqlite3'
#platforms :jruby do
# gem 'jruby-openssl'
# gem 'activerecord-jdbcmysql-adapter'
#end
gem 'net-ldap' gem 'net-ldap'
# Use unicorn as the web server # Use unicorn as the web server