Added e-mail edit field to settings, proper format default for webfinger

diff --git a/app/controllers/xrd_controller.rb b/app/controllers/xrd_controller.rb
index e00485f5e8957ee2f4991562b61a7ab44e2ec2e4..159a954b37ec93d76f4fb46b5bd0ba5bb1b4125d 100644 (file)
--- a/app/controllers/xrd_controller.rb
+++ b/app/controllers/xrd_controller.rb
@@ -1,4 +1,6 @@
 class XrdController < ApplicationController
+  before_action :set_default_format
+
   def host_meta
     @webfinger_template = "#{webfinger_url}?resource={uri}"
 
@@ -22,6 +24,10 @@ class XrdController < ApplicationController
 
   private
 
+  def set_default_format
+    request.format = 'json' if request.headers["HTTP_ACCEPT"].nil? && params[:format].nil?
+  end
+
   def username_from_resource
     if resource_param.start_with?('acct:') || resource_param.include?('@')
       resource_param.split('@').first.gsub('acct:', '')

diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 78f4ef5dc874ad9921d92c4d9d48f0fcea56211d..567f0ea443a21f81b5693e5568d0cc5831c0bc15 100644 (file)
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -4,6 +4,8 @@
 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
   = devise_error_messages!
 
+  .field
+    = f.email_field :email, placeholder: 'E-mail address'
   .field
     = f.password_field :password, autocomplete: "off", placeholder: 'New password'
   .field