github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc

This commit is contained in:
Didier Lafforgue 2012-03-14 01:16:10 +01:00
parent fbd945cf6d 52247242fc
commit ada199cf3c
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -33,7 +33,7 @@ group :test do
# gem 'growl-glue' # gem 'growl-glue'
gem 'cucumber-rails' gem 'cucumber-rails', :require => false
gem 'rspec-rails', '~> 2.8.0' gem 'rspec-rails', '~> 2.8.0'
gem 'shoulda-matchers' gem 'shoulda-matchers'

2
lib/locomotive.rb
View File

@ -1,5 +1,3 @@
puts "\t...loading core"
require 'locomotive/version' require 'locomotive/version'
require 'locomotive/core_ext' require 'locomotive/core_ext'
require 'locomotive/configuration' require 'locomotive/configuration'

2
lib/locomotive/dependencies.rb
View File

@ -1,5 +1,3 @@
puts "\t...loading dependencies"
require 'mongoid' require 'mongoid'
require 'mongoid/railtie' require 'mongoid/railtie'
require 'mongoid/tree' require 'mongoid/tree'

2
lib/locomotive/engine.rb
View File

@ -1,5 +1,3 @@
puts "...loading Locomotive engine"
require 'locomotive/dependencies' require 'locomotive/dependencies'
require 'locomotive' require 'locomotive'