revert to devise 3.0.x due to confirmable misbehaviour

as documented here: https://github.com/plataformatec/devise/issues/3009

also update mailer to use letter_opener and also localhost:8080 since
we're mostly using unicorn at this point.
This commit is contained in:
Skud
2014-05-01 22:48:13 +10:00
parent f7411da5cf
commit b489fda18e
5 changed files with 18 additions and 11 deletions

View File

@@ -84,6 +84,7 @@ group :development do
gem 'debugger'
gem 'better_errors'
gem 'binding_of_caller'
gem 'letter_opener'
end
# Markdown formatting for updates etc
@@ -93,7 +94,7 @@ gem 'bluecloth'
gem 'will_paginate', '~> 3.0'
# user signup/login/etc
gem 'devise'
gem 'devise', '~> 3.0.0'
# nicely formatted URLs
gem 'friendly_id', '~> 4.0.10'

View File

@@ -58,8 +58,11 @@ GEM
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.6)
arel (3.0.3)
bcrypt (3.1.7)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
@@ -70,7 +73,7 @@ GEM
railties (>= 3.0)
builder (3.0.4)
cancan (1.6.10)
chunky_png (1.3.0)
chunky_png (1.3.1)
coderay (1.1.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
@@ -103,11 +106,10 @@ GEM
debugger-ruby_core_source (~> 1.3.2)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.3.2)
devise (3.2.4)
bcrypt (~> 3.0)
devise (3.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.1.3)
docile (1.1.3)
@@ -150,6 +152,8 @@ GEM
thor (>= 0.14, < 2.0)
json (1.7.7)
kgio (2.9.2)
launchy (2.4.2)
addressable (~> 2.3)
leaflet-markercluster-rails (0.7.0)
railties (>= 3.1)
leaflet-rails (0.7.2)
@@ -158,6 +162,8 @@ GEM
less-rails (2.3.3)
actionpack (>= 3.1)
less (~> 2.3.1)
letter_opener (1.2.0)
launchy (~> 2.2)
libv8 (3.16.14.3)
mail (2.5.4)
mime-types (~> 1.16)
@@ -252,7 +258,6 @@ GEM
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.3)
tilt (1.4.1)
tins (1.1.0)
treetop (1.4.15)
@@ -292,7 +297,7 @@ DEPENDENCIES
csv_shaper
dalli
debugger
devise
devise (~> 3.0.0)
factory_girl_rails (~> 4.0)
figaro
flickraw
@@ -308,6 +313,7 @@ DEPENDENCIES
leaflet-rails
less (~> 2.3.2)
less-rails (~> 2.3.3)
letter_opener
libv8 (= 3.16.14.3)
memcachier
newrelic_rpm

View File

@@ -40,9 +40,9 @@ Growstuff::Application.configure do
# Growstuff config
config.new_crops_request_link = "http://example.com/not-a-real-url"
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.action_mailer.default_url_options = { :host => 'localhost:8080' }
config.action_mailer.delivery_method = :smtp
config.action_mailer.delivery_method = :letter_opener
config.action_mailer.smtp_settings = {
:port => '587',
:address => 'smtp.mandrillapp.com',

View File

@@ -39,7 +39,7 @@ Growstuff::Application.configure do
# Growstuff config
config.new_crops_request_link = "http://example.com/not-a-real-url"
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.action_mailer.default_url_options = { :host => 'localhost:8080' }
Growstuff::Application.configure do
config.host = 'test.example.com'

View File

@@ -6,7 +6,7 @@ Devise.setup do |config|
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
config.mailer_sender = "Growstuff <noreply@growstuff.org>"
config.secret_key = ENV['RAILS_SECRET_TOKEN'] || 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
# config.secret_key = ENV['RAILS_SECRET_TOKEN'] || 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
# Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer"