Merge branch 'next-minor' into develop

Changelog.md

@@ -12,6 +12,7 @@
 * Use string-direction gem for rtl detection [#7181](https://github.com/diaspora/diaspora/pull/7181)
 * Reduce i18n.load side effects [#7184](https://github.com/diaspora/diaspora/pull/7184)
 * Force jasmine fails on syntax errors [#7185](https://github.com/diaspora/diaspora/pull/7185)
+* Don't display mail-related view content if it is disabled in the pod's config [#7190](https://github.com/diaspora/diaspora/pull/7190)
 
 ## Bug fixes
 * Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)

app/helpers/sessions_helper.rb

@@ -13,7 +13,7 @@ module SessionsHelper
   end
 
   def display_password_reset_link?
-    devise_mapping.recoverable? && controller_name != "passwords"
+    AppConfig.mail.enable? && devise_mapping.recoverable? && controller_name != "passwords"
   end
 
   def flash_class(name)

app/views/devise/shared/_links.haml

@@ -1,13 +1,13 @@
 - if controller_name != 'sessions'
   = link_to t('.sign_in'), new_session_path(resource_name)
   %br/
-- if AppConfig.settings.enable_registrations? && devise_mapping.registerable? && controller_name != 'registrations'
+- if display_registration_link?
   = link_to t('.sign_up'), new_registration_path(resource_name)
   %br/
 - else
   %b= t('.sign_up_closed')
   %br/
-- if devise_mapping.recoverable? && controller_name != 'passwords'
+- if display_password_reset_link?
   = link_to t('.forgot_your_password'), new_password_path(resource_name)
   %br/
 - if devise_mapping.confirmable? && controller_name != 'confirmations'

app/views/invitations/new.html.haml

@@ -1,32 +1,33 @@
 #paste_link
-  = t('.paste_link')
+  = t(".paste_link")
   %span#codes_left
     = "(" + t(".codes_left", count: @invite_code.count) + ")" unless AppConfig.settings.enable_registrations?
 .form-horizontal
   .control-group
     = invite_link(@invite_code)
 
+- if AppConfig.mail.enable?
   #email_invitation
-  = form_tag new_user_invitation_path, class: 'form-horizontal' do
+    = form_tag new_user_invitation_path, class: "form-horizontal" do
 
       .form-group
-      %label.col-sm-2.control-label{ for: 'email_inviter_emails' }
-        = t('email')
+        %label.col-sm-2.control-label{for: "email_inviter_emails"}
+          = t("email")
         .col-sm-10
-        = text_field_tag 'email_inviter[emails]', @invalid_emails, title: t('.comma_separated_plz'),
-            placeholder: 'foo@bar.com, max@foo.com...', class: "form-control"
+          = text_field_tag "email_inviter[emails]", @invalid_emails, title: t(".comma_separated_plz"),
+              placeholder: "foo@bar.com, max@foo.com...", class: "form-control"
           #already_sent
             = t("invitations.create.note_already_sent", emails: @valid_emails) unless @valid_emails.empty?
 
       .form-group
-      %label.col-sm-2.control-label{ for: 'email_inviter_locale' }
-        = t('.language')
+        %label.col-sm-2.control-label{for: "email_inviter_locale"}
+          = t(".language")
         .col-sm-10
-        = select_tag 'email_inviter[locale]',  options_from_collection_for_select(available_language_options,
+          = select_tag "email_inviter[locale]", options_from_collection_for_select(available_language_options,
               "second", "first", selected: current_user.language), class: "form-control"
 
       .form-group
         .pull-right.col-md-12
-        = submit_tag t('.send_an_invitation'), class: 'btn btn-primary pull-right',
-            data: {disable_with: t('.sending_invitation')}
+          = submit_tag t(".send_an_invitation"), class: "btn btn-primary pull-right",
+              data: {disable_with: t(".sending_invitation")}
         .clearfix

app/views/shared/_invitations.haml

@@ -1,5 +1,7 @@
 = t(".share_this")
 = invite_link(current_user.invitation_code)
+
+- if AppConfig.mail.enable?
   .invitations-link.btn.btn-link#invitations-button{"data-toggle" => "modal"}
     = t(".by_email")
 

app/views/users/_edit.haml

@@ -117,6 +117,7 @@
 
     = render partial: "post_default"
 
+    - if AppConfig.mail.enable?
       .row
         .col-md-12
           %h3