Merge branch 'next-minor' into develop

.rubocop.yml

@@ -170,10 +170,6 @@ Layout/DotPosition:
 
 ### backward compatibility
 
-# only with ruby >= 2.3
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # only with ruby >= 2.4
 Performance/RegexpMatch:
   Enabled: false

Changelog.md

@@ -18,6 +18,8 @@
 * Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)
 * Move enable/disable notification icon [#7592](https://github.com/diaspora/diaspora/pull/7592)
 * Use Bootstrap 3 progress-bar for polls [#7600](https://github.com/diaspora/diaspora/pull/7600)
+* Enable frozen string literals [#7595](https://github.com/diaspora/diaspora/pull/7595)
+* Remove `rails_admin_histories` table [#7597](https://github.com/diaspora/diaspora/pull/7597)
 
 ## Bug fixes
 * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "rails", "5.1.3"

Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: false do
   watch(/^spec\/.+_spec\.rb$/)
   watch(/^lib\/(.+)\.rb$/)       {|m| "spec/lib/#{m[1]}_spec.rb" }

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/admin/admin_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class AdminController < ApplicationController
     before_action :authenticate_user!

app/controllers/admin/pods_controller.rb

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Admin
   class PodsController < AdminController
     respond_to :html, :json, :mobile

app/controllers/admin/users_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class UsersController < AdminController
 

app/controllers/admins_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AdminsController < Admin::AdminController
   include ApplicationHelper
 

app/controllers/api/openid_connect/authorizations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module OpenidConnect
     class AuthorizationsController < ApplicationController

app/controllers/api/openid_connect/clients_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module OpenidConnect
     class ClientsController < ApplicationController

app/controllers/api/openid_connect/discovery_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2011 nov matake
 #
 # Permission is hereby granted, free of charge, to any person obtaining

app/controllers/api/openid_connect/id_tokens_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2011 nov matake
 #
 # Permission is hereby granted, free of charge, to any person obtaining

app/controllers/api/openid_connect/token_endpoint_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module OpenidConnect
     class TokenEndpointController < ApplicationController

app/controllers/api/openid_connect/user_applications_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module OpenidConnect
     class UserApplicationsController < ApplicationController

app/controllers/api/openid_connect/user_info_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module OpenidConnect
     class UserInfoController < ApplicationController

app/controllers/api/v0/base_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V0
     class BaseController < ApplicationController

app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2012, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/aspect_memberships_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/aspects_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/blocks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BlocksController < ApplicationController
   before_action :authenticate_user!
 

app/controllers/comments_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/contacts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/conversation_visibilities_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/conversations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ConversationsController < ApplicationController
   before_action :authenticate_user!
   respond_to :html, :mobile, :json, :js

app/controllers/help_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class HelpController < ApplicationController
 end

app/controllers/home_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2012, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/invitation_codes_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class InvitationCodesController < ApplicationController
   before_action :ensure_valid_invite_code
 

app/controllers/invitations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/likes_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/messages_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/node_info_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class NodeInfoController < ApplicationController
   def jrd
     render json: NodeInfo.jrd(CGI.unescape(node_info_url("123.123").sub("123.123", "%{version}")))

app/controllers/notifications_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/participations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ParticipationsController < ApplicationController
   before_action :authenticate_user!
 

app/controllers/people_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/photos_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/poll_participations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PollParticipationsController < ApplicationController
   before_action :authenticate_user!
 

app/controllers/posts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/profiles_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/registrations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/report_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/reshares_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ResharesController < ApplicationController
   before_action :authenticate_user!, except: :index
   respond_to :json

app/controllers/search_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SearchController < ApplicationController
   before_action :authenticate_user!
 

app/controllers/services_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/sessions_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/share_visibilities_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/social_relay_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SocialRelayController < ApplicationController
   respond_to :json
 

app/controllers/status_messages_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/streams_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/tag_followings_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/tags_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/terms_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/controllers/users_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/activity_streams_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActivityStreamsHelper
   def add_activitystreams_author(target, person)
     target.author do |author|

app/helpers/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
@@ -15,8 +17,9 @@ module ApplicationHelper
     return AppConfig.settings.changelog_url.get if AppConfig.settings.changelog_url.present?
 
     url = "https://github.com/diaspora/diaspora/blob/master/Changelog.md"
-    url.sub!('/master/', "/#{AppConfig.git_revision}/") if AppConfig.git_revision.present?
-    url
+    return url if AppConfig.git_revision.blank?
+
+    url.sub("/master/", "/#{AppConfig.git_revision}/")
   end
 
   def source_url

app/helpers/aspect_global_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/contacts_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContactsHelper
   def start_a_conversation_link(aspect, contacts_size)
     conv_opts = { class: "conversation_button contacts_button"}

app/helpers/conversations_helper.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module ConversationsHelper
   def conversation_class(conversation, unread_count, selected_conversation_id)
-    conv_class = unread_count > 0 ? "unread " : ""
-    if selected_conversation_id && conversation.id == selected_conversation_id
-      conv_class << "selected"
-    end
-    conv_class
+    conv_class = unread_count > 0 ? "unread" : ""
+    return conv_class unless selected_conversation_id && conversation.id == selected_conversation_id
+
+    "#{conv_class} selected"
   end
 end

app/helpers/error_messages_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/getting_started_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/gon_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GonHelper
   def gon_load_contact(contact)
     Gon.preloads[:contacts] ||= []

app/helpers/interim_stream_hackiness_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InterimStreamHackinessHelper
   def commenting_disabled?(post)
     return true unless user_signed_in?

app/helpers/invitation_codes_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InvitationCodesHelper
   def invite_hidden_tag(invite)
     if invite.present?

app/helpers/jsxc_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JsxcHelper
   def get_bosh_endpoint
     proto = AppConfig.chat.server.bosh.proto

app/helpers/language_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LanguageHelper
   include ApplicationHelper
 

app/helpers/layout_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/meta_data_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MetaDataHelper
   include ActionView::Helpers::AssetUrlHelper
   include ActionView::Helpers::TagHelper

app/helpers/mobile_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MobileHelper
   def mobile_reshare_icon(post)
     if (post.public? || reshare?(post)) && (user_signed_in? && post.author != current_user.person)

app/helpers/notifications_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationsHelper
   include PeopleHelper
   include PostsHelper

app/helpers/notifier_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotifierHelper
 
   # @param post [Post] The post object.

app/helpers/o_embed_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OEmbedHelper
   def o_embed_html(cache)
     data = cache.data

app/helpers/open_graph_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OpenGraphHelper
   def og_html(cache)
     "<a href=\"#{cache.url}\" target=\"_blank\">" +

app/helpers/people_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
@@ -24,11 +26,9 @@ module PeopleHelper
   end
 
   def person_link(person, opts={})
-    opts[:class] ||= ""
-    opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
-    opts[:class] << " hovercardable" if defined?(user_signed_in?) && user_signed_in? && current_user.person != person
+    css_class = person_link_class(person, opts[:class])
     remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
-    "<a data-hovercard='#{remote_or_hovercard_link}' href='#{remote_or_hovercard_link}' class='#{opts[:class]}'>"\
+    "<a data-hovercard='#{remote_or_hovercard_link}' href='#{remote_or_hovercard_link}' class='#{css_class}'>"\
       "#{html_escape_once(opts[:display_name] || person.name)}</a>"\
       .html_safe
   end
@@ -44,11 +44,9 @@ module PeopleHelper
     if opts[:to] == :photos
       link_to person_image_tag(person, opts[:size]), person_photos_path(person)
     else
-      opts[:class] ||= ""
-      opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
-      opts[:class] << " hovercardable" if defined?(user_signed_in?) && user_signed_in? && current_user.person != person
+      css_class = person_link_class(person, opts[:class])
       remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
-      "<a href='#{remote_or_hovercard_link}' class='#{opts[:class]}' #{ ("target=" + opts[:target]) if opts[:target]}>
+      "<a href='#{remote_or_hovercard_link}' class='#{css_class}' #{('target=' + opts[:target]) if opts[:target]}>
       #{person_image_tag(person, opts[:size])}
       </a>".html_safe
     end
@@ -77,4 +75,14 @@ module PeopleHelper
       return Rails.application.routes.url_helpers.person_path(person, opts)
     end
   end
+
+  private
+
+  def person_link_class(person, css_class)
+    return css_class unless defined?(user_signed_in?) && user_signed_in?
+
+    return "#{css_class} self" if current_user.person == person
+
+    "#{css_class} hovercardable"
+  end
 end

app/helpers/posts_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2012, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/profile_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/publisher_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/report_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2012, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/services_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ServicesHelper
   def contact_proxy(friend)
     friend.contact || contact_proxy_template.dup.tap {|c| c.person = friend.person }

app/helpers/sessions_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SessionsHelper
   def prefilled_username
     uri = Addressable::URI.parse(session["user_return_to"])

app/helpers/statistics_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/stream_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.

app/helpers/tags_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TagsHelper
   def looking_for_tag_link
     return if search_query.include?('@') || normalize_tag_name(search_query).blank?

app/helpers/user_applications_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UserApplicationsHelper
   def user_application_name(app)
     if app.name?

app/helpers/users_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UsersHelper
   def owner_image_tag(size=nil)
     person_image_tag(current_user.person, size)

app/mailers/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationMailer < ActionMailer::Base
   default from: "\"#{AppConfig.settings.pod_name}\" <#{AppConfig.mail.sender_address}>"
 end

app/mailers/diaspora_devise_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DiasporaDeviseMailer < Devise::Mailer
   default from: "\"#{AppConfig.settings.pod_name}\" <#{AppConfig.mail.sender_address}>"
 

app/mailers/export_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ExportMailer < ApplicationMailer
   def export_complete_for(user)
     @user = user

app/mailers/maintenance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Maintenance < ApplicationMailer
   def account_removal_warning(user)
     @user = user

app/mailers/notification_mailers/also_commented.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class AlsoCommented < NotificationMailers::Base
     attr_accessor :comment

app/mailers/notification_mailers/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class Base
     include Diaspora::Logging
@@ -52,7 +54,7 @@ module NotificationMailers
     def log_mail(recipient_id, sender_id, type)
       log_string = "event=mail mail_type=#{type} recipient_id=#{recipient_id} sender_id=#{sender_id} " \
                    " recipient_handle=#{@recipient.diaspora_handle}"
-      log_string << " sender_handle=#{@sender.diaspora_handle}" if sender_id.present?
+      log_string = "#{log_string} sender_handle=#{@sender.diaspora_handle}" if sender_id.present?
 
       logger.info log_string
     end

app/mailers/notification_mailers/comment_on_post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class CommentOnPost < NotificationMailers::Base
     attr_accessor :comment

app/mailers/notification_mailers/confirm_email.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class ConfirmEmail < NotificationMailers::Base
     def set_headers

app/mailers/notification_mailers/csrf_token_fail.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class CsrfTokenFail < NotificationMailers::Base
     def set_headers

app/mailers/notification_mailers/liked.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class Liked < NotificationMailers::Base
     attr_accessor :like

app/mailers/notification_mailers/mentioned.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class Mentioned < NotificationMailers::Base
     attr_accessor :post

app/mailers/notification_mailers/mentioned_in_comment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class MentionedInComment < NotificationMailers::Base
     attr_reader :comment

app/mailers/notification_mailers/private_message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class PrivateMessage < NotificationMailers::Base
     attr_accessor :message, :conversation, :participants

app/mailers/notification_mailers/reshared.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class Reshared < NotificationMailers::Base
     attr_accessor :reshare

app/mailers/notification_mailers/started_sharing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotificationMailers
   class StartedSharing < NotificationMailers::Base
     def set_headers(*_args) # rubocop:disable Style/AccessorMethodName

app/mailers/notifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Notifier < ApplicationMailer
   helper :application
   helper :notifier