Change some stuff to be in ENV.

This commit is contained in:
Tyrel Souza 2014-04-21 15:59:30 -04:00
parent 22d789837d
commit 1d81a48459
5 changed files with 53 additions and 48 deletions

View File

@ -10,35 +10,37 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.0.4) actionmailer (4.1.0)
actionpack (= 4.0.4) actionpack (= 4.1.0)
actionview (= 4.1.0)
mail (~> 2.5.4) mail (~> 2.5.4)
actionpack (4.0.4) actionpack (4.1.0)
activesupport (= 4.0.4) actionview (= 4.1.0)
builder (~> 3.1.0) activesupport (= 4.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
activemodel (4.0.4) actionview (4.1.0)
activesupport (= 4.0.4) activesupport (= 4.1.0)
builder (~> 3.1.0) builder (~> 3.1)
activerecord (4.0.4) erubis (~> 2.7.0)
activemodel (= 4.0.4) activemodel (4.1.0)
activerecord-deprecated_finders (~> 1.0.2) activesupport (= 4.1.0)
activesupport (= 4.0.4) builder (~> 3.1)
arel (~> 4.0.0) activerecord (4.1.0)
activerecord-deprecated_finders (1.0.3) activemodel (= 4.1.0)
activesupport (4.0.4) activesupport (= 4.1.0)
arel (~> 5.0.0)
activesupport (4.1.0)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2) json (~> 1.7, >= 1.7.7)
multi_json (~> 1.3) minitest (~> 5.1)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo (~> 0.3.37) tzinfo (~> 1.1)
addressable (2.3.6) addressable (2.3.6)
airbrake (3.1.16) airbrake (3.1.16)
builder builder
multi_json multi_json
arel (4.0.2) arel (5.0.1.20140414130214)
awesome_print (1.2.0) awesome_print (1.2.0)
bcrypt (3.1.7) bcrypt (3.1.7)
better_errors (1.1.0) better_errors (1.1.0)
@ -48,7 +50,7 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootstrap-sass (3.0.3.0) bootstrap-sass (3.0.3.0)
sass (~> 3.2) sass (~> 3.2)
builder (3.1.4) builder (3.2.2)
capybara (2.1.0) capybara (2.1.0)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
@ -70,10 +72,10 @@ GEM
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
database_cleaner (1.2.0) database_cleaner (1.2.0)
debug_inspector (0.0.2) debug_inspector (0.0.2)
delayed_job (4.0.0) delayed_job (4.0.1)
activesupport (>= 3.0, < 4.1) activesupport (>= 3.0, < 4.2)
delayed_job_active_record (4.0.0) delayed_job_active_record (4.0.1)
activerecord (>= 3.0, < 4.1) activerecord (>= 3.0, < 4.2)
delayed_job (>= 3.0, < 4.1) delayed_job (>= 3.0, < 4.1)
devise (3.2.4) devise (3.2.4)
bcrypt (~> 3.0) bcrypt (~> 3.0)
@ -117,7 +119,7 @@ GEM
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mini_portile (0.5.3) mini_portile (0.5.3)
minitest (4.7.5) minitest (5.3.3)
multi_json (1.9.2) multi_json (1.9.2)
nokogiri (1.6.1) nokogiri (1.6.1)
mini_portile (~> 0.5.0) mini_portile (~> 0.5.0)
@ -134,21 +136,23 @@ GEM
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rack-timeout (0.0.4) rack-timeout (0.0.4)
rails (4.0.4) rails (4.1.0)
actionmailer (= 4.0.4) actionmailer (= 4.1.0)
actionpack (= 4.0.4) actionpack (= 4.1.0)
activerecord (= 4.0.4) actionview (= 4.1.0)
activesupport (= 4.0.4) activemodel (= 4.1.0)
activerecord (= 4.1.0)
activesupport (= 4.1.0)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.4) railties (= 4.1.0)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0)
railties (4.0.4) railties (4.1.0)
actionpack (= 4.0.4) actionpack (= 4.1.0)
activesupport (= 4.0.4) activesupport (= 4.1.0)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.13.0) raindrops (0.13.0)
rake (10.2.2) rake (10.3.1)
recipient_interceptor (0.1.2) recipient_interceptor (0.1.2)
mail mail
rspec-core (2.14.8) rspec-core (2.14.8)
@ -165,12 +169,12 @@ GEM
rspec-mocks (~> 2.14.0) rspec-mocks (~> 2.14.0)
safe_yaml (1.0.2) safe_yaml (1.0.2)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.2) sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0) sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0)
shoulda-matchers (2.5.0) shoulda-matchers (2.6.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
simplecov (0.7.1) simplecov (0.7.1)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -178,14 +182,14 @@ GEM
simplecov-html (0.7.1) simplecov-html (0.7.1)
slop (3.5.0) slop (3.5.0)
spring (1.1.2) spring (1.1.2)
spring-commands-rspec (1.0.1) spring-commands-rspec (1.0.2)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (2.11.0) sprockets (2.11.0)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1) sprockets-rails (2.1.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
@ -199,7 +203,8 @@ GEM
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.39) tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.5.0) uglifier (2.5.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)

View File

@ -7,10 +7,6 @@ class CampaignsController < ApplicationController
end end
def show def show
# respond_to do |format|
# format.json { render json: @campaign, include: [:videolistings,] }
# format.html { render html: @campaign }
# end
@campaign @campaign
end end

View File

@ -38,5 +38,6 @@ module Vidpush
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # 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.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de # config.i18n.default_locale = :de
config.secret_key_base = ENV['SECRET_KEY_BASE']
end end
end end

View File

@ -5,6 +5,8 @@ development: &default
min_messages: warning min_messages: warning
pool: 2 pool: 2
timeout: 5000 timeout: 5000
user: <%= ENV['RAILS_DB_USER'] %>
host: localhost
test: test:
<<: *default <<: *default

View File

@ -5,6 +5,7 @@ Devise.setup do |config|
# random tokens. Changing this key will render invalid all existing # random tokens. Changing this key will render invalid all existing
# confirmation, reset password and unlock tokens in the database. # confirmation, reset password and unlock tokens in the database.
# config.secret_key = '1907d667a98478e7bedc2efe509c1a5bd467e2bcb32d182c077473632367b8dd9fdb6efa183e4b5a0e9ac24be0739042ee2ac81fec566938f8ecca2f11f41899' # config.secret_key = '1907d667a98478e7bedc2efe509c1a5bd467e2bcb32d182c077473632367b8dd9fdb6efa183e4b5a0e9ac24be0739042ee2ac81fec566938f8ecca2f11f41899'
config.secret_key = ENV['DEVISE_SECRET_KEY']
# ==> Mailer Configuration # ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer, # Configure the e-mail address which will be shown in Devise::Mailer,