Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
jodyalbritton committed Jul 21, 2014
2 parents cf68ac0 + 528f73f commit 3fda5a8b92796cb24915287cbb8957c313b352fa
Showing with 11 additions and 0 deletions.
  1. +1 −0 Gemfile
  2. +3 −0 Gemfile.lock
  3. +7 −0 config/application.rb
View
@@ -27,6 +27,7 @@ gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc
#gems for user accounts and objects
+gem 'ads-rails'
gem 'devise'
gem 'omniauth-facebook'
gem 'omniauth-twitter'
View
@@ -45,6 +45,8 @@ GEM
activerecord (>= 3, < 5)
acts_as_list (0.4.0)
activerecord (>= 3.0)
+ ads-rails (0.1.1)
+ rails (>= 3.1.0, < 4.2.0)
ancestry (2.1.0)
activerecord (>= 3.0.0)
arel (5.0.1.20140414130214)
@@ -304,6 +306,7 @@ DEPENDENCIES
aasm
acts-as-taggable-on (~> 3.2.5)
acts_as_list
+ ads-rails
ancestry
authority
autonumeric-rails
View
7 config/application.rb 100644 → 100755
@@ -19,5 +19,12 @@ class Application < Rails::Application
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
+
+ config.ads.renderer = lambda { |options|
+ tag(
+ :img,
+ src: "http://placehold.it/#{options[:width]}x#{options[:height]}&text=Adsense"
+ )
+ }
end
end

0 comments on commit 3fda5a8

Please sign in to comment.