diff --git a/Gemfile b/Gemfile index 9b638d81b..b947d6b69 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,6 @@ group :assets do gem 'sass-rails', '~> 3.2.4' gem 'coffee-rails', '~> 3.2.2' gem 'compass-rails', '~> 1.0.0.rc.3' - gem 'compass_twitter_bootstrap', '~> 2.0.1.2' gem 'uglifier', '~> 1.2.1' gem 'therubyracer', '~> 0.9.10' end diff --git a/Gemfile.lock b/Gemfile.lock index fe06f3d6b..dc37fd324 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,8 +95,6 @@ GEM sass (~> 3.1) compass-rails (1.0.0.rc.3) compass (~> 0.12.rc.0) - compass_twitter_bootstrap (2.0.1.2) - compass creole (0.4.2) daemons (1.1.6) delayed_job (3.0.1) @@ -312,7 +310,6 @@ DEPENDENCIES capistrano_colors coffee-rails (~> 3.2.2) compass-rails (~> 1.0.0.rc.3) - compass_twitter_bootstrap (~> 2.0.1.2) creole daemons (= 1.1.6) delayed_job_active_record (~> 0.3.2) diff --git a/app/assets/stylesheets/design/common.scss b/app/assets/stylesheets/design/common.scss index b3bc37c8c..991c793d9 100644 --- a/app/assets/stylesheets/design/common.scss +++ b/app/assets/stylesheets/design/common.scss @@ -1,7 +1,3 @@ -//@import "compass"; -//@import "compass_twitter_bootstrap"; -//@import "compass_twitter_bootstrap_responsive"; - @import 'compass/utilities/tables'; table.info { width: 100%; diff --git a/script/delayed_job b/script/delayed_job index 526e4170f..da53fc1ff 100755 --- a/script/delayed_job +++ b/script/delayed_job @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -# ENV['RAILS_ENV'] ||= "production" +ENV['RAILS_ENV'] ||= "production" require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment')) require 'delayed/command' Delayed::Command.new(ARGV).daemonize