Commiting

app/views/auth/registrations/edit.html.haml

@@ -27,7 +27,7 @@
 
 = render 'sessions'
 
-- if open_deletion?
-  %hr.spacer/
-  %h4= t('auth.delete_account')
-  %p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
+
+%hr.spacer/
+%h4= t('auth.delete_account')
+%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)

app/views/auth/registrations/new.html.haml

@@ -9,11 +9,6 @@
 
   = render 'shared/error_messages', object: resource
 
-  - if @invite.present? && @invite.autofollow?
-    .fields-group{ style: 'margin-bottom: 30px' }
-      %p.hint{ style: 'text-align: center' }= t('invites.invited_by')
-      = render 'application/card', account: @invite.user.account
-
   = f.simple_fields_for :account do |ff|
     .fields-group
       = ff.input :username, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off' }, hint: t('simple_form.hints.defaults.username', domain: site_hostname)
@@ -27,13 +22,6 @@
   .fields-group
     = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' }
 
-  - if approved_registrations? && !@invite.present?
-    .fields-group
-      = f.simple_fields_for :invite_request do |invite_request_fields|
-        = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: false
-
-  = f.input :invite_code, as: :hidden
-
   .fields-group
     = f.input :challenge, wrapper: :with_label, label: "Are you human? What is #{@challenge_add_1} + #{@challenge_add_2} = ", required: true, input_html: { 'aria-label' => "Are you human? What is #{@challenge_add_1} + #{@challenge_add_2}", :autocomplete => 'off' }
 
@@ -41,6 +29,6 @@
     = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', about_tos_path: about_tos_path)
 
   .actions
-    = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit
+    = f.button :button, t('auth.register'), type: :submit
 
 .form-footer= render 'auth/shared/links'

app/views/auth/sessions/new.html.haml

@@ -18,13 +18,4 @@
   .actions
     = f.button :button, t('auth.login'), type: :submit
 
-- if devise_mapping.omniauthable? and resource_class.omniauth_providers.any?
-  .simple_form.alternative-login
-    %h4= t('auth.or_log_in_with')
-
-    .actions
-      - resource_class.omniauth_providers.each do |provider|
-        = link_to omniauth_authorize_path(resource_name, provider), class: "button button-#{provider}" do
-          = t("auth.providers.#{provider}", default: provider.to_s.chomp("_oauth2").capitalize)
-
 .form-footer= render 'auth/shared/links'