Browse Source

Migrate to Heroku Cedar stack

master
Adrian Short 11 years ago
parent
commit
3b4f9f8f1c
3 changed files with 23 additions and 13 deletions
  1. +5
    -4
      Gemfile
  2. +7
    -0
      Gemfile.lock
  3. +11
    -9
      config/initializers/mail.rb

+ 5
- 4
Gemfile View File

@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby "1.9.2"
gem 'rails', '3.2.12'

# Gems used only for assets and not required
@@ -22,9 +22,6 @@ gem 'jquery-rails'
# To use Jbuilder templates for JSON
# gem 'jbuilder'

# Use unicorn as the app server
# gem 'unicorn'

# Deploy with Capistrano
# gem 'capistrano'

@@ -39,6 +36,10 @@ gem 'will_paginate', '~> 3.0'
gem 'activerecord-postgresql-adapter'
gem 'pg'

group :production do
gem 'unicorn'
end

group :development do
gem 'meta_request'
gem 'better_errors'


+ 7
- 0
Gemfile.lock View File

@@ -81,6 +81,7 @@ GEM
json (1.7.7)
jwt (0.1.5)
multi_json (>= 1.0)
kgio (2.8.0)
loofah (1.0.0)
nokogiri (>= 1.3.3)
mail (2.4.4)
@@ -127,6 +128,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (10.0.3)
rdoc (3.12.1)
json (~> 1.4)
@@ -155,6 +157,10 @@ GEM
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
unicorn (4.6.2)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
will_paginate (3.0.4)

PLATFORMS
@@ -175,4 +181,5 @@ DEPENDENCIES
sass-rails (~> 3.2.3)
sorcery
uglifier (>= 1.0.3)
unicorn
will_paginate (~> 3.0)

+ 11
- 9
config/initializers/mail.rb View File

@@ -1,9 +1,11 @@
ActionMailer::Base.smtp_settings = {
:address => 'smtp.sendgrid.net',
:port => '587',
:authentication => :plain,
:user_name => ENV['SENDGRID_USERNAME'],
:password => ENV['SENDGRID_PASSWORD'],
:domain => 'heroku.com'
}
ActionMailer::Base.delivery_method = :smtp
if(Rails.env.production?)
ActionMailer::Base.smtp_settings = {
:address => 'smtp.sendgrid.net',
:port => '587',
:authentication => :plain,
:user_name => ENV['SENDGRID_USERNAME'],
:password => ENV['SENDGRID_PASSWORD'],
:domain => 'heroku.com'
}
ActionMailer::Base.delivery_method = :smtp
end

Loading…
Cancel
Save