diff --git a/Gemfile b/Gemfile index c4772f0..79d4669 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,6 @@ gem 'activerecord-postgresql-adapter' gem 'pg' gem 'delayed_job_active_record' gem 'daemons' -gem 'heroku_delayed_job_autoscale' group :production do gem 'unicorn' diff --git a/Gemfile.lock b/Gemfile.lock index a1bd38b..50eb733 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,6 @@ GEM activesupport (3.2.12) i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.3.3) arel (3.0.2) bcrypt-ruby (3.0.1) better_errors (0.6.0) @@ -56,12 +55,10 @@ GEM activerecord (>= 2.1.0, < 4) delayed_job (~> 3.0) erubis (2.7.0) - excon (0.16.10) execjs (1.4.0) multi_json (~> 1.0) faraday (0.8.5) multipart-post (~> 1.1) - fattr (2.2.1) feedzirra (0.0.31) activesupport (>= 3.0.8) builder (~> 3.0.0) @@ -79,18 +76,6 @@ GEM activesupport (>= 3.1, < 4.1) haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) - heroku (2.35.0) - heroku-api (~> 0.3.7) - launchy (>= 0.3.2) - netrc (~> 0.7.7) - rest-client (~> 1.6.1) - rubyzip - heroku-api (0.3.8) - excon (~> 0.16.10) - heroku_delayed_job_autoscale (0.0.7) - delayed_job (>= 2.1) - heroku (>= 1) - rush (>= 0.6) hike (1.2.1) htmlentities (4.3.1) httpauth (0.2.0) @@ -103,8 +88,6 @@ GEM jwt (0.1.5) multi_json (>= 1.0) kgio (2.8.0) - launchy (2.2.0) - addressable (~> 2.3) loofah (1.0.0) nokogiri (>= 1.3.3) mail (2.4.4) @@ -117,7 +100,6 @@ GEM mime-types (1.21) multi_json (1.6.1) multipart-post (1.1.5) - netrc (0.7.7) nokogiri (1.4.7) oauth (0.4.7) oauth2 (0.8.1) @@ -156,11 +138,6 @@ GEM rake (10.0.3) rdoc (3.12.1) json (~> 1.4) - rest-client (1.6.7) - mime-types (>= 1.16) - rubyzip (0.9.9) - rush (0.6.8) - session sass (3.2.5) sass-rails (3.2.6) railties (~> 3.2.0) @@ -168,8 +145,6 @@ GEM tilt (~> 1.3) sax-machine (0.0.20) nokogiri (> 0.0.0) - session (3.1.0) - fattr sorcery (0.8.1) bcrypt-ruby (~> 3.0.0) oauth (~> 0.4.4) @@ -206,7 +181,6 @@ DEPENDENCIES delayed_job_active_record feedzirra haml-rails - heroku_delayed_job_autoscale htmlentities jquery-rails meta_request diff --git a/app/models/feed.rb b/app/models/feed.rb index da24cb2..321c506 100644 --- a/app/models/feed.rb +++ b/app/models/feed.rb @@ -1,5 +1,4 @@ class Feed < ActiveRecord::Base - include HerokuDelayedJobAutoscale::Autoscale has_many :posts, :dependent => :destroy has_and_belongs_to_many :layers attr_accessible :title, :url, :description, :generator, :last_fetched, :feed_url