recipes/views.rb in rails_apps_composer-2.4.20 vs recipes/views.rb in rails_apps_composer-2.4.21
- old
+ new
@@ -2,10 +2,10 @@
# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/views.rb
after_bundler do
say_wizard "recipe running after 'bundle install'"
### DEVISE ###
- if prefer :authentication, 'devise'
+ if (prefer :authentication, 'devise') and (not prefer :apps4, 'rails-devise')
copy_from_repo 'app/views/devise/shared/_links.html.erb'
unless prefer :form_builder, 'simple_form'
copy_from_repo 'app/views/devise/registrations/edit.html.erb'
copy_from_repo 'app/views/devise/registrations/new.html.erb'
else