Permalink
Browse files

commented out local tumblr config

  • Loading branch information...
1 parent 21642ec commit 1939ee98dc054b1a06cec96bb7a0f2087197542d @monfresh committed Apr 30, 2012
Showing with 7 additions and 0 deletions.
  1. +4 −0 app/controllers/users_controller.rb
  2. +3 −0 config/initializers/omniauth.rb
@@ -21,7 +21,11 @@ def update
def show
@user = User.find(params[:id])
+ #tumblr_config = YAML.load(File.open("#{::Rails.root}/config/oauth.yml").read)
+
Tumblr.configure do |config|
+ #config.consumer_key = tumblr_config['tumblr']['key']
+ #config.consumer_secret = tumblr_config['tumblr']['secret']
config.consumer_key = ENV["TUMBLR_KEY"]
config.consumer_secret = ENV["TUMBLR_SECRET"]
config.oauth_token = @user.token
@@ -1,3 +1,6 @@
+#config = YAML.load(File.open("#{::Rails.root}/config/oauth.yml").read)
+
Rails.application.config.middleware.use OmniAuth::Builder do
+ #provider :tumblr, config['tumblr']['key'], config['tumblr']['secret']
provider :tumblr, ENV["TUMBLR_KEY"], ENV["TUMBLR_SECRET"]
end

0 comments on commit 1939ee9

Please sign in to comment.