lib/generators/blacklight/user_generator.rb in blacklight-6.0.0.pre5 vs lib/generators/blacklight/user_generator.rb in blacklight-6.0.0

@@ -16,11 +16,15 @@
  2. Injects blacklight-specific behavior into your user model
 """
     # Install Devise?
     def generate_devise_assets
       if options[:devise]
-        gem "devise"
+        if ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
+          gem 'devise', github: 'plataformatec/devise' # Need > 3.5.3
+        else
+          gem "devise"
+        end
         gem "devise-guests", "~> 0.3"
 
         Bundler.with_clean_env do
           run "bundle install"
         end
@@ -29,14 +33,14 @@
         generate "devise", model_name.classify
         generate "devise_guests", model_name.classify
 
         # add the #to_s to the model.
         insert_into_file("app/models/#{model_name}.rb", before: /end(\n| )*$/) do
-          "\n  # Method added by Blacklight; Blacklight uses #to_s on your\n" +
-          "  # user class to get a user-displayable login/identifier for\n" +
-          "  # the account.\n" +
-          "  def to_s\n" +
-          "    email\n" +
+          "\n  # Method added by Blacklight; Blacklight uses #to_s on your\n" \
+          "  # user class to get a user-displayable login/identifier for\n" \
+          "  # the account.\n" \
+          "  def to_s\n" \
+          "    email\n" \
           "  end\n"
         end
         gsub_file("config/initializers/devise.rb", "config.sign_out_via = :delete", "config.sign_out_via = :get")
       end
     end