gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Update devise to latest version

Browse source 
* use letter_opener for mails in development
* bring back the flash
* fix redirect loop for logging in
* move all mailer/devise settings to config/config.yml
This commit is contained in:
Henne Vogelsang 2014-03-24 12:45:04 +01:00
parent 7920c3df65
commit 18968a05b1
11 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Gemfile.lock
View file

@ -34,7 +34,9 @@ GEM
activerecord (>= 3.0)
activesupport (>= 3.0)
awesome_nested_set (>= 2.0)
addressable (2.3.5)
arel (3.0.3)
atomic (1.1.16)
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
axlsx (2.0.1)
@ -44,6 +46,7 @@ GEM
axlsx_rails (0.1.5)
axlsx
rails (>= 3.1)
bcrypt (3.1.7)
bcrypt-ruby (3.0.1)
bootstrap-sass (3.1.1.0)
sass (~> 3.2)
@ -67,11 +70,12 @@ GEM
d3_rails (3.4.3)
railties (>= 3.1.0)
daemons (1.1.9)
devise (2.2.8)
bcrypt-ruby (~> 3.0)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (1.0.3)
@ -97,6 +101,10 @@ GEM
jquery-ui-rails (4.1.2)
railties (>= 3.1.0)
json (1.8.1)
launchy (2.4.2)
addressable (~> 2.3)
letter_opener (1.2.0)
launchy (~> 2.2)
libv8 (3.16.14.3)
mail (2.5.4)
mime-types (~> 1.16)
@ -104,7 +112,7 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.2)
multi_json (1.9.0)
multi_json (1.9.2)
mysql2 (0.3.15)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
@ -194,6 +202,8 @@ GEM
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.3.1)
atomic (>= 1.1.7, < 2)
tilt (1.4.1)
transitions (0.1.12)
treetop (1.4.15)
@ -224,13 +234,14 @@ DEPENDENCIES
capybara (= 1.1.2)
cocoon
d3_rails
devise (~> 2.2)
devise
formtastic-bootstrap
gravtastic
haml
jquery-fileupload-rails
jquery-rails
jquery-ui-rails
letter_opener
mysql2
paper_trail
paperclip (~> 3.0)