commit f1a70411dc804b9861593632e13142feac4d244d Author: František Dvořák Date: Thu Sep 18 22:36:18 2014 +0200 Remove the bundler (branch 1.0.x). diff --git a/config/application.rb b/config/application.rb index 6f37af1..72c497e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -8,9 +8,24 @@ require 'action_controller/railtie' require 'rails/test_unit/railtie' # require 'sprockets/railtie' -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) +# Gemfile requires +require 'rails' +require 'rails-api' +require 'jbuilder' +require 'rack/cors' +require 'dalli' +require 'kgio' +require 'warden' +require 'logstasher' +require 'hashie' +require 'ice_nine' +require 'occi-core' +# opennebula backend +begin + require 'opennebula' + require 'erubis' +rescue LoadError +end # Extend Object with #deep_freeze require 'ice_nine/core_ext/object' diff --git a/config/boot.rb b/config/boot.rb index 3596736..e69de29 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,4 +0,0 @@ -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])