Permalink
Browse files

Removed pg from engine. Not required right now and breaking travis

  • Loading branch information...
Stephan Hagemann
Stephan Hagemann committed Sep 15, 2012
1 parent f75557e commit cb6bf07cea484e9b68f72d44a97eac577ddac5c4
@@ -59,7 +59,6 @@ GEM
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.6)
- pg (0.14.1)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -120,6 +119,5 @@ PLATFORMS
DEPENDENCIES
jquery-rails
- pg
rspec-rails
teaser!
@@ -1,7 +1,7 @@
require File.expand_path('../boot', __FILE__)
# Pick the frameworks you want:
-require "active_record/railtie"
+#require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
require "active_resource/railtie"
@@ -53,7 +53,7 @@ class Application < Rails::Application
# This will create an empty whitelist of attributes available for mass-assignment for all models
# in your app. As such, your models will need to explicitly whitelist or blacklist accessible
# parameters by using an attr_accessible or attr_protected declaration.
- config.active_record.whitelist_attributes = true
+ #config.active_record.whitelist_attributes = true
# Enable the asset pipeline
config.assets.enabled = true
@@ -30,7 +30,7 @@
config.action_mailer.delivery_method = :test
# Raise exception on mass assignment protection for Active Record models
- config.active_record.mass_assignment_sanitizer = :strict
+ #config.active_record.mass_assignment_sanitizer = :strict
# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr
@@ -7,8 +7,8 @@
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
RSpec.configure do |config|
- config.fixture_path = "#{::Rails.root}/spec/fixtures"
- config.use_transactional_fixtures = true
+ #config.fixture_path = "#{::Rails.root}/spec/fixtures"
+ #config.use_transactional_fixtures = true
config.infer_base_class_for_anonymous_controllers = false
config.order = "random"
end
@@ -20,5 +20,4 @@ Gem::Specification.new do |s|
s.add_dependency "haml-rails"
s.add_dependency "sass-rails"
- s.add_development_dependency "pg"
end

0 comments on commit cb6bf07

Please sign in to comment.