From b58db48d26e32dea6594e035bc7707248cda9143 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 19 Mar 2012 14:04:28 +0800 Subject: [PATCH] Changes in Gemfile --- Gemfile | 4 ++-- Gemfile.lock | 11 ++++++----- config/application.rb | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index fabc1833..024f3449 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem "brakeman" gem 'bson_ext' gem 'carrierwave' gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' -gem 'devise' +gem 'devise', '1.5.3' gem 'exception_notification' # Send error trace gem 'execjs' gem 'jquery-rails' @@ -23,7 +23,7 @@ gem 'rubyzip' gem 'sinatra' gem 'sprockets' gem 'tinymce-rails' -#gem 'therubyracer' +gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux") # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index dd1a1d59..1df648c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM multi_json (~> 1.0) archive-tar-minitar (0.5.2) arel (2.2.3) - bcrypt-ruby (3.0.1-x86-mingw32) + bcrypt-ruby (3.0.1) brakeman (1.5.1) activesupport erubis (~> 2.6) @@ -71,11 +71,10 @@ GEM database_cleaner (0.7.1) delorean (1.2.0) chronic - devise (2.0.4) + devise (1.5.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) - railties (~> 3.1) - warden (~> 1.1.1) + warden (~> 1.1) diff-lcs (1.1.3) erubis (2.7.0) exception_notification (2.5.2) @@ -199,6 +198,7 @@ GEM rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) + spork (0.9.0) spork (0.9.0-x86-mingw32) win32-process sprockets (2.0.3) @@ -232,6 +232,7 @@ GEM windows-api (>= 0.3.0) PLATFORMS + ruby x86-mingw32 DEPENDENCIES @@ -242,7 +243,7 @@ DEPENDENCIES coffee-rails database_cleaner delorean - devise + devise (= 1.5.3) exception_notification execjs factory_girl_rails diff --git a/config/application.rb b/config/application.rb index d1243133..381d1c64 100644 --- a/config/application.rb +++ b/config/application.rb @@ -19,7 +19,7 @@ module Orbit # Add directories for plugins config.paths["vendor/plugins"] += %W(#{config.root}/vendor/built_in_modules) config.paths["vendor/plugins"] += %W(#{config.root}/vendor/downloaded_modules) - config.paths.app.views << "app/views/devise" + config.paths["app/views"] += %W(#{config.root}/app/views/devise) # Settings in config/environments/* take precedence over those specified here.