developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes in Gemfile

This commit is contained in:
Christophe Vilayphiou 2012-03-19 14:04:28 +08:00
parent fdb3707024
commit b58db48d26
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -6,7 +6,7 @@ gem "brakeman"
gem 'bson_ext' gem 'bson_ext'
gem 'carrierwave' gem 'carrierwave'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
gem 'devise' gem 'devise', '1.5.3'
gem 'exception_notification' # Send error trace gem 'exception_notification' # Send error trace
gem 'execjs' gem 'execjs'
gem 'jquery-rails' gem 'jquery-rails'
@ -23,7 +23,7 @@ gem 'rubyzip'
gem 'sinatra' gem 'sinatra'
gem 'sprockets' gem 'sprockets'
gem 'tinymce-rails' gem 'tinymce-rails'
#gem 'therubyracer' gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
# 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.

11
Gemfile.lock
View File

@ -40,7 +40,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
archive-tar-minitar (0.5.2) archive-tar-minitar (0.5.2)
arel (2.2.3) arel (2.2.3)
bcrypt-ruby (3.0.1-x86-mingw32) bcrypt-ruby (3.0.1)
brakeman (1.5.1) brakeman (1.5.1)
activesupport activesupport
erubis (~> 2.6) erubis (~> 2.6)
@ -71,11 +71,10 @@ GEM
database_cleaner (0.7.1) database_cleaner (0.7.1)
delorean (1.2.0) delorean (1.2.0)
chronic chronic
devise (2.0.4) devise (1.5.3)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3) orm_adapter (~> 0.0.3)
railties (~> 3.1) warden (~> 1.1)
warden (~> 1.1.1)
diff-lcs (1.1.3) diff-lcs (1.1.3)
erubis (2.7.0) erubis (2.7.0)
exception_notification (2.5.2) exception_notification (2.5.2)
@ -199,6 +198,7 @@ GEM
rack (~> 1.3, >= 1.3.6) rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2) rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
spork (0.9.0)
spork (0.9.0-x86-mingw32) spork (0.9.0-x86-mingw32)
win32-process win32-process
sprockets (2.0.3) sprockets (2.0.3)
@ -232,6 +232,7 @@ GEM
windows-api (>= 0.3.0) windows-api (>= 0.3.0)
PLATFORMS PLATFORMS
ruby
x86-mingw32 x86-mingw32
DEPENDENCIES DEPENDENCIES
@ -242,7 +243,7 @@ DEPENDENCIES
coffee-rails coffee-rails
database_cleaner database_cleaner
delorean delorean
devise devise (= 1.5.3)
exception_notification exception_notification
execjs execjs
factory_girl_rails factory_girl_rails

2
config/application.rb
View File

@ -19,7 +19,7 @@ module Orbit
# Add directories for plugins # Add directories for plugins
config.paths["vendor/plugins"] += %W(#{config.root}/vendor/built_in_modules) config.paths["vendor/plugins"] += %W(#{config.root}/vendor/built_in_modules)
config.paths["vendor/plugins"] += %W(#{config.root}/vendor/downloaded_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. # Settings in config/environments/* take precedence over those specified here.