Permalink
Browse files

Misc rails3 updates and bug fixes

  • Loading branch information...
1 parent 94d1172 commit 10d9f0262e0f105ef639d9d3ca0e48cd054a8749 @chewbranca chewbranca committed Jan 16, 2012
View
@@ -25,6 +25,7 @@ gem 'sitemap_generator'
gem "SystemTimer"
gem "aasm"
gem "aws-s3"
+gem "aws-sdk"
gem "acl9"
gem "paperclip"
gem 'amazon-ecs'
View
@@ -103,6 +103,11 @@ GEM
builder
mime-types
xml-simple
+ aws-sdk (1.2.6)
+ httparty (~> 0.7)
+ json (~> 1.4)
+ nokogiri (>= 1.4.4)
+ uuidtools (~> 2.1)
babosa (0.3.5)
bitly (0.7.0)
crack (>= 0.1.4)
@@ -320,6 +325,7 @@ GEM
kgio (~> 2.4)
rack
raindrops (~> 0.6)
+ uuidtools (2.1.2)
vegas (0.1.8)
rack (>= 1.0.0)
will_paginate (3.0.2)
@@ -341,6 +347,7 @@ DEPENDENCIES
amazon-ecs
awesome_print
aws-s3
+ aws-sdk
bitly
capistrano
capistrano-ext
@@ -17,8 +17,8 @@ def self.expire_class klass, namespace = nil
if keys.any?
$redis.sunion(*(keys)).each do |key_name|
if key_name =~ /^view_object:([0-9]+)$/
- view_object = ViewObject.find($1)
- view_object.uncache_deps
+ view_object = ViewObject.find_by_id($1)
+ view_object.uncache_deps if view_object
end
end
end
@@ -10,7 +10,7 @@
- unless current_user.present?
.subtitle
- = t('.logged_in_error'
+ == #{t '.logged_in_error'} #{link_to 'Login now', login_path(:return_to => request.request_uri)}
= link_to 'Login now', login_path(:return_to => request.url)
- else
@@ -9,7 +9,8 @@
APP_CONFIG = {}
end
-resque_file = Rails.root.join('config/resque.yml')
+resque_base_file = Rails.root.join('config/resque.yml')
+resque_file = File.exists?(resque_base_file) ? resque_base_file : (resque_base_file.to_s + '.sample')
resque_config = YAML.load_file(resque_file)
Resque.redis = resque_config[rails_env]
APP_CONFIG['redis'] = resque_config[rails_env]
@@ -24,7 +25,8 @@
end
require 'resque_scheduler'
-resque_schedule_file = Rails.root.join('config/resque_schedule.yml')
+resque_schedule_base_file = Rails.root.join('config/resque_schedule.yml')
+resque_schedule_file = File.exists?(resque_schedule_base_file) ? resque_schedule_base_file : (resque_schedule_base_file.to_s + '.sample')
resque_schedule_config = YAML.load_file(resque_schedule_file)
Resque.schedule = resque_schedule_config
View
@@ -88,6 +88,7 @@
resources :translations
end
+ resources :menu_items
resources :newswires
resources :prediction_groups do
member do
View
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../config/boot', __FILE__)
-require 'commands/console'

0 comments on commit 10d9f02

Please sign in to comment.