Merge branch 'master' of github.com:spot-us/spot-us

spot-us · Jun 23, 2011 · 9cfcb5c · 9cfcb5c
2 parents c4f05f1 + 8f32764
commit 9cfcb5c
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 67 deletions.
diff --git a/app/controllers/api/credits_controller.rb b/app/controllers/api/credits_controller.rb
@@ -0,0 +1,2 @@
+class Api::CreditsController < ApplicationController
+end
diff --git a/app/controllers/api/donations_controller.rb b/app/controllers/api/donations_controller.rb
@@ -0,0 +1,2 @@
+class Api::DonationsController < ApplicationController
+end
diff --git a/app/controllers/api/pitches_controller.rb b/app/controllers/api/pitches_controller.rb
@@ -0,0 +1,2 @@
+class Api::PitchesController < ApplicationController
+end
diff --git a/app/controllers/api/stories_controller.rb b/app/controllers/api/stories_controller.rb
@@ -0,0 +1,2 @@
+class Api::StoriesController < ApplicationController
+end
diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
@@ -0,0 +1,2 @@
+class Api::UsersController < ApplicationController
+end
diff --git a/app/models/news_item.rb b/app/models/news_item.rb
@@ -38,8 +38,6 @@
 #  current_funding             :decimal(15, 2)
 #
 
-require "url_shortener"
-
 class NewsItem < ActiveRecord::Base
   include HasTopics
   include AASMWithFixes

diff --git a/config/environment.rb b/config/environment.rb
@@ -33,10 +33,14 @@
   config.gem "cucumber", :lib => false, :version => "= 0.1.16"
   config.gem "webrat", :lib => false, :version => "= 0.4.4"
   config.gem "money", :version => ">=2.1.3"
-  config.gem "oauth2"
+  config.gem "oauth2", :version => "= 0.4.1"
+  config.gem "faraday", :version => "= 0.6.1"
   config.gem "json"
   config.gem "twitter_oauth"
-
+  config.gem "memcached"
+  config.gem "right_aws"
+  config.gem "url_shortener"
+
   config.time_zone = 'UTC'
 
   config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )

diff --git a/config/facebooker.yml.example b/config/facebooker.yml.example
diff --git a/config/initializers/lib_references.rb b/config/initializers/lib_references.rb
@@ -1 +0,0 @@
-require 'memcached'

diff --git a/config/s3.yml.example b/config/s3.yml.example
@@ -0,0 +1,3 @@
+development:
+    access_key_id: "access_key_id"
+    secret_access_key: "secret_access_key"