Merge branch 'frozen-string-enable-app-helpers' into 'master'

Enable frozen string for app/helpers/**/*.rb

See merge request gitlab-org/gitlab-ce!21320

app/helpers/accounts_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AccountsHelper
   def incoming_email_token_enabled?
     current_user.incoming_email_token && Gitlab::IncomingEmail.supports_issue_creation?

app/helpers/active_sessions_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveSessionsHelper
   # Maps a device type as defined in `ActiveSession` to an svg icon name and
   # outputs the icon html.

app/helpers/appearances_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AppearancesHelper
   def brand_title
     current_appearance&.title.presence || 'GitLab Community Edition'

app/helpers/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest/md5'
 require 'uri'
 
@@ -106,11 +108,11 @@ module ApplicationHelper
   #
   # Returns an HTML-safe String
   def time_ago_with_tooltip(time, placement: 'top', html_class: '', short_format: false)
-    css_classes = short_format ? 'js-short-timeago' : 'js-timeago'
+    css_classes = [short_format ? 'js-short-timeago' : 'js-timeago']
-    css_classes << " #{html_class}" unless html_class.blank?
+    css_classes << html_class unless html_class.blank?
 
     element = content_tag :time, l(time, format: "%b %d, %Y"),
-      class: css_classes,
+      class: css_classes.join(' '),
       title: l(time.to_time.in_time_zone, format: :timeago_tooltip),
       datetime: time.to_time.getutc.iso8601,
       data: {

app/helpers/application_settings_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationSettingsHelper
   extend self
 
@@ -73,12 +75,12 @@ module ApplicationSettingsHelper
   def oauth_providers_checkboxes
     button_based_providers.map do |source|
       disabled = Gitlab::CurrentSettings.disabled_oauth_sign_in_sources.include?(source.to_s)
-      css_class = 'btn'
+      css_class = ['btn']
-      css_class << ' active' unless disabled
+      css_class << 'active' unless disabled
       checkbox_name = 'application_setting[enabled_oauth_sign_in_sources][]'
       name = Gitlab::Auth::OAuth::Provider.label_for(source)
 
-      label_tag(checkbox_name, class: css_class) do
+      label_tag(checkbox_name, class: css_class.join(' ')) do
         check_box_tag(checkbox_name, source, !disabled,
                       autocomplete: 'off',
                       id: name.tr(' ', '_')) + name

app/helpers/auth_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AuthHelper
   PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq).freeze
   LDAP_PROVIDER = /\Aldap/

app/helpers/auto_devops_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AutoDevopsHelper
   def show_auto_devops_callout?(project)
     Feature.get(:auto_devops_banner_disabled).off? &&

app/helpers/avatars_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AvatarsHelper
   def project_icon(project_id, options = {})
     source_icon(Project, project_id, options)
@@ -125,9 +127,9 @@ module AvatarsHelper
 
   def source_identicon(source, options = {})
     bg_key = (source.id % 7) + 1
-    options[:class] ||= ''
+
-    options[:class] << ' identicon'
+    options[:class] =
-    options[:class] << " bg#{bg_key}"
+      [*options[:class], "identicon bg#{bg_key}"].join(' ')
 
     content_tag(:div, class: options[:class].strip) do
       source.name[0, 1].upcase

app/helpers/award_emoji_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AwardEmojiHelper
   def toggle_award_url(awardable)
     return url_for([:toggle_award_emoji, awardable]) unless @project || awardable.is_a?(Note)

app/helpers/blame_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BlameHelper
   def age_map_duration(blame_groups, project)
     now = Time.zone.now

app/helpers/blob_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BlobHelper
   def highlight(blob_name, blob_content, repository: nil, plain: false)
     plain ||= blob_content.length > Blob::MAXIMUM_TEXT_HIGHLIGHT_SIZE

app/helpers/boards_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BoardsHelper
   def board
     @board ||= @board || @boards.first

app/helpers/branches_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BranchesHelper
   def project_branches
     options_for_select(@project.repository.branch_names, @project.default_branch)

app/helpers/breadcrumbs_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BreadcrumbsHelper
   def add_to_breadcrumbs(text, link)
     @breadcrumbs_extra_links ||= []

app/helpers/broadcast_messages_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BroadcastMessagesHelper
   def broadcast_message(message)
     return unless message.present?
@@ -8,18 +10,17 @@ module BroadcastMessagesHelper
   end
 
   def broadcast_message_style(broadcast_message)
-    style = ''
+    style = []
 
     if broadcast_message.color.present?
       style << "background-color: #{broadcast_message.color}"
-      style << '; ' if broadcast_message.font.present?
     end
 
     if broadcast_message.font.present?
       style << "color: #{broadcast_message.font}"
     end
 
-    style
+    style.join('; ')
   end
 
   def broadcast_message_status(broadcast_message)

app/helpers/builds_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BuildsHelper
   def build_summary(build, skip: false)
     if build.has_trace?
@@ -12,10 +14,10 @@ module BuildsHelper
   end
 
   def sidebar_build_class(build, current_build)
-    build_class = ''
+    build_class = []
-    build_class += ' active' if build.id === current_build.id
+    build_class << 'active' if build.id === current_build.id
-    build_class += ' retried' if build.retried?
+    build_class << 'retried' if build.retried?
-    build_class
+    build_class.join(' ')
   end
 
   def javascript_build_options

app/helpers/button_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ButtonHelper
   # Output a "Copy to Clipboard" button
   #

app/helpers/calendar_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CalendarHelper
   def calendar_url_options
     { format: :ics,

app/helpers/ci_status_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # DEPRECATED
 #

app/helpers/clusters_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ClustersHelper
   def has_multiple_clusters?(project)
     false

app/helpers/commits_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CommitsHelper
   # Returns a link to the commit author. If the author has a matching user and
   # is a member of the current @project it will link to the team member page.

app/helpers/compare_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CompareHelper
   def create_mr_button?(from = params[:from], to = params[:to], project = @project)
     from.present? &&

app/helpers/components_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComponentsHelper
   def gitlab_workhorse_version
     if request.headers['Gitlab-Workhorse'].present?

app/helpers/conversational_development_index_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ConversationalDevelopmentIndexHelper
   def score_level(score)
     if score < 33.33

app/helpers/count_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CountHelper
   def approximate_count_with_delimiters(count_data, model)
     count = count_data[model]

app/helpers/dashboard_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DashboardHelper
   def assigned_issues_dashboard_path
     issues_dashboard_path(assignee_id: current_user.id)

app/helpers/defer_script_tag_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeferScriptTagHelper
   # Override the default ActionView `javascript_include_tag` helper to support page specific deferred loading
   def javascript_include_tag(*sources)

app/helpers/deploy_tokens_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeployTokensHelper
   def expand_deploy_tokens_section?(deploy_token)
     deploy_token.persisted? ||

app/helpers/diff_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DiffHelper
   def mark_inline_diffs(old_line, new_line)
     old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_line, new_line).inline_diffs
@@ -39,7 +41,8 @@ module DiffHelper
     line_num_class = %w[diff-line-num unfold js-unfold]
     line_num_class << 'js-unfold-bottom' if bottom
 
-    html = ''
+    html = []
+
     if old_pos
       html << content_tag(:td, '...', class: [*line_num_class, 'old_line'], data: { linenumber: old_pos })
       html << content_tag(:td, text, class: [*content_line_class, 'left-side']) if view == :parallel
@@ -50,7 +53,7 @@ module DiffHelper
       html << content_tag(:td, text, class: [*content_line_class, ('right-side' if view == :parallel)])
     end
 
-    html.html_safe
+    html.join.html_safe
   end
 
   def diff_line_content(line)
@@ -215,9 +218,7 @@ module DiffHelper
   end
 
   def toggle_whitespace_link(url, options)
-    options[:class] ||= ''
+    options[:class] = [*options[:class], 'btn btn-default'].join(' ')
-    options[:class] << ' btn btn-default'
-
     link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: options[:class]
   end
 

app/helpers/dropdowns_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DropdownsHelper
   def dropdown_tag(toggle_text, options: {}, &block)
     content_tag :div, class: "dropdown #{options[:wrapper_class] if options.key?(:wrapper_class)}" do
@@ -10,7 +12,7 @@ module DropdownsHelper
       dropdown_output = dropdown_toggle(toggle_text, data_attr, options)
 
       dropdown_output << content_tag(:div, class: "dropdown-menu dropdown-select #{options[:dropdown_class] if options.key?(:dropdown_class)}") do
-        output = ""
+        output = []
 
         if options.key?(:title)
           output << dropdown_title(options[:title])
@@ -31,8 +33,7 @@ module DropdownsHelper
         end
 
         output << dropdown_loading
-
+        output.join.html_safe
-        output.html_safe
       end
 
       dropdown_output.html_safe
@@ -50,7 +51,7 @@ module DropdownsHelper
 
   def dropdown_title(title, options: {})
     content_tag :div, class: "dropdown-title" do
-      title_output = ""
+      title_output = []
 
       if options.fetch(:back, false)
         title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-back", aria: { label: "Go back" }, type: "button") do
@@ -66,7 +67,7 @@ module DropdownsHelper
         end
       end
 
-      title_output.html_safe
+      title_output.join.html_safe
     end
   end
 

app/helpers/emails_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EmailsHelper
   include AppearancesHelper
 
@@ -49,8 +51,8 @@ module EmailsHelper
 
   def reset_token_expire_message
     link_tag = link_to('request a new one', new_user_password_url(user_email: @user.email))
-    msg = "This link is valid for #{password_reset_token_valid_time}.  "
+    "This link is valid for #{password_reset_token_valid_time}.  " \
-    msg << "After it expires, you can #{link_tag}."
+    "After it expires, you can #{link_tag}."
   end
 
   def header_logo

app/helpers/emoji_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EmojiHelper
   def emoji_icon(*args)
     raw Gitlab::Emoji.gl_emoji_tag(*args)

app/helpers/environment_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EnvironmentHelper
   def environment_for_build(project, build)
     return unless build.environment

app/helpers/environments_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EnvironmentsHelper
   def environments_list_data
     {

app/helpers/events_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EventsHelper
   ICON_NAMES_BY_EVENT_TYPE = {
     'pushed to' => 'commit',

app/helpers/explore_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ExploreHelper
   def filter_projects_path(options = {})
     exist_opts = {

app/helpers/external_wiki_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ExternalWikiHelper
   def get_project_wiki_path(project)
     external_wiki_service = project.external_wiki

app/helpers/favicon_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FaviconHelper
   def favicon_extension_whitelist
     FaviconUploader::EXTENSION_WHITELIST

app/helpers/form_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FormHelper
   def form_errors(model, type: 'form')
     return unless model.errors.any?

app/helpers/git_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitHelper
   def strip_gpg_signature(text)
     text.gsub(/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m, "")

app/helpers/gitlab_routing_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Shorter routing method for some project items
 module GitlabRoutingHelper
   extend ActiveSupport::Concern

app/helpers/graph_helper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module GraphHelper
   def refs(repo, commit)
-    refs = commit.ref_names(repo).join(' ')
+    refs = [commit.ref_names(repo).join(' ')]
 
     # append note count
     notes_count = @graph.notes[commit.id]
     refs << "[#{pluralize(notes_count, 'note')}]" if notes_count > 0
 
-    refs
+    refs.join
   end
 
   def parents_zip_spaces(parents, parent_spaces)

app/helpers/groups_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GroupsHelper
   def group_nav_link_paths
     %w[groups#projects groups#edit badges#index ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]
@@ -43,22 +45,22 @@ module GroupsHelper
 
   def group_title(group, name = nil, url = nil)
     @has_group_title = true
-    full_title = ''
+    full_title = []
 
     group.ancestors.reverse.each_with_index do |parent, index|
       if index > 0
         add_to_breadcrumb_dropdown(group_title_link(parent, hidable: false, show_avatar: true, for_dropdown: true), location: :before)
       else
-        full_title += breadcrumb_list_item group_title_link(parent, hidable: false)
+        full_title << breadcrumb_list_item(group_title_link(parent, hidable: false))
       end
     end
 
-    full_title += render "layouts/nav/breadcrumbs/collapsed_dropdown", location: :before, title: _("Show parent subgroups")
+    full_title << render("layouts/nav/breadcrumbs/collapsed_dropdown", location: :before, title: _("Show parent subgroups"))
 
-    full_title += breadcrumb_list_item group_title_link(group)
+    full_title << breadcrumb_list_item(group_title_link(group))
-    full_title += ' &middot; '.html_safe + link_to(simple_sanitize(name), url, class: 'group-path breadcrumb-item-text js-breadcrumb-item-text') if name
+    full_title << ' &middot; '.html_safe + link_to(simple_sanitize(name), url, class: 'group-path breadcrumb-item-text js-breadcrumb-item-text') if name
 
-    full_title.html_safe
+    full_title.join.html_safe
   end
 
   def projects_lfs_status(group)
@@ -138,15 +140,8 @@ module GroupsHelper
 
   def group_title_link(group, hidable: false, show_avatar: false, for_dropdown: false)
     link_to(group_path(group), class: "group-path #{'breadcrumb-item-text' unless for_dropdown} js-breadcrumb-item-text #{'hidable' if hidable}") do
-      output =
+      icon = group_icon(group, class: "avatar-tile", width: 15, height: 15) if (group.try(:avatar_url) || show_avatar) && !Rails.env.test?
-        if (group.try(:avatar_url) || show_avatar) && !Rails.env.test?
+      [icon, simple_sanitize(group.name)].join.html_safe
-          group_icon(group, class: "avatar-tile", width: 15, height: 15)
-        else
-          ""
-        end
-
-      output << simple_sanitize(group.name)
-      output.html_safe
     end
   end
 

app/helpers/hooks_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HooksHelper
   def link_to_test_hook(hook, trigger)
     path = case hook

app/helpers/icons_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module IconsHelper
@@ -47,9 +49,10 @@ module IconsHelper
       end
     end
 
-    css_classes = size ? "s#{size}" : ""
+    css_classes = []
-    css_classes << " #{css_class}" unless css_class.blank?
+    css_classes << "s#{size}" if size
-    content_tag(:svg, content_tag(:use, "", { "xlink:href" => "#{sprite_icon_path}##{icon_name}" } ), class: css_classes.empty? ? nil : css_classes)
+    css_classes << "#{css_class}" unless css_class.blank?
+    content_tag(:svg, content_tag(:use, "", { "xlink:href" => "#{sprite_icon_path}##{icon_name}" } ), class: css_classes.empty? ? nil : css_classes.join(' '))
   end
 
   def external_snippet_icon(name)
@@ -70,10 +73,10 @@ module IconsHelper
   end
 
   def spinner(text = nil, visible = false)
-    css_class = 'loading'
+    css_class = ['loading']
-    css_class << ' hide' unless visible
+    css_class << 'hide' unless visible
 
-    content_tag :div, class: css_class do
+    content_tag :div, class: css_class.join(' ') do
       icon('spinner spin') + text
     end
   end
@@ -97,9 +100,10 @@ module IconsHelper
         'globe'
       end
 
-    name << " fw" if fw
+    name = [name]
+    name << "fw" if fw
 
-    icon(name, options)
+    icon(name.join(' '), options)
   end
 
   def file_type_icon_class(type, mode, name)

app/helpers/import_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ImportHelper
   include ::Gitlab::Utils::StrongMemoize
 

app/helpers/instance_configuration_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InstanceConfigurationHelper
   def instance_configuration_cell_html(value, &block)
     return '-' unless value.to_s.presence

app/helpers/issuables_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IssuablesHelper
   include GitlabRoutingHelper
 
@@ -167,8 +169,9 @@ module IssuablesHelper
   end
 
   def issuable_meta(issuable, project, text)
-    output = ""
+    output = []
     output << "Opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe
+
     output << content_tag(:strong) do
       author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "d-none d-sm-inline", tooltip: true)
       author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-block d-sm-none")
@@ -185,7 +188,7 @@ module IssuablesHelper
     output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block")
     output << content_tag(:span, (issuable.task_status_short if issuable.tasks?), id: "task_status_short", class: "d-md-none")
 
-    output.html_safe
+    output.join.html_safe
   end
 
   def issuable_todo(issuable)

app/helpers/issues_helper.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module IssuesHelper
   def issue_css_classes(issue)
-    classes = "issue"
+    classes = ["issue"]
-    classes << " closed" if issue.closed?
+    classes << "closed" if issue.closed?
-    classes << " today" if issue.today?
+    classes << "today" if issue.today?
-    classes
+    classes.join(' ')
   end
 
   # Returns an OpenStruct object suitable for use by <tt>options_from_collection_for_select</tt>
@@ -105,8 +107,8 @@ module IssuesHelper
   end
 
   def link_to_discussions_to_resolve(merge_request, single_discussion = nil)
-    link_text = merge_request.to_reference
+    link_text = [merge_request.to_reference]
-    link_text += " (discussion #{single_discussion.first_note.id})" if single_discussion
+    link_text << "(discussion #{single_discussion.first_note.id})" if single_discussion
 
     path = if single_discussion
              Gitlab::UrlBuilder.build(single_discussion.first_note)
@@ -115,7 +117,7 @@ module IssuesHelper
              project_merge_request_path(project, merge_request)
            end
 
-    link_to link_text, path
+    link_to link_text.join(' '), path
   end
 
   def show_new_issue_link?(project)

app/helpers/javascript_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JavascriptHelper
   def page_specific_javascript_tag(js)
     javascript_include_tag asset_path(js)

app/helpers/kerberos_spnego_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KerberosSpnegoHelper
   def allow_basic_auth?
     true # different behavior in GitLab Enterprise Edition

app/helpers/labels_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LabelsHelper
   extend self
   include ActionView::Helpers::TagHelper

app/helpers/lazy_image_tag_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LazyImageTagHelper
   def placeholder_image
     "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
@@ -11,9 +13,11 @@ module LazyImageTagHelper
       options[:data] ||= {}
       options[:data][:src] = path_to_image(source)
 
-      options[:class] ||= ""
+      # options[:class] can be either String or Array.
-      options[:class] << " lazy"
+      klass_opts = Array.wrap(options[:class])
+      klass_opts << "lazy"
 
+      options[:class] = klass_opts.join(' ')
       source = placeholder_image
     end
 

app/helpers/markup_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 
 module MarkupHelper

app/helpers/mattermost_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MattermostHelper
   def mattermost_teams_options(teams)
     teams.map do |team|

app/helpers/members_helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module MembersHelper
   def remove_member_message(member, user: nil)
     user = current_user if defined?(current_user)
+    text = 'Are you sure you want to'
 
-    text = 'Are you sure you want to '
     action =
       if member.request?
         if member.user == user
@@ -16,13 +18,12 @@ module MembersHelper
         "remove #{member.user.name} from"
       end
 
-    text << action << " the #{member.source.human_name} #{member.real_source_type.humanize(capitalize: false)}?"
+    "#{text} #{action} the #{member.source.human_name} #{member.real_source_type.humanize(capitalize: false)}?"
   end
 
   def remove_member_title(member)
-    text = " from #{member.real_source_type.humanize(capitalize: false)}"
+    action = member.request? ? 'Deny access request' : 'Remove user'
-
+    "#{action} from #{member.real_source_type.humanize(capitalize: false)}"
-    text.prepend(member.request? ? 'Deny access request' : 'Remove user')
   end
 
   def leave_confirmation_message(member_source)
@@ -32,9 +33,6 @@ module MembersHelper
 
   def filter_group_project_member_path(options = {})
     options = params.slice(:search, :sort).merge(options)
-
+    "#{request.path}?#{options.to_param}"
-    path = request.path
-    path << "?#{options.to_param}"
-    path
   end
 end

app/helpers/merge_requests_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MergeRequestsHelper
   def new_mr_path_from_push_event(event)
     target_project = event.project.default_merge_request_target
@@ -19,10 +21,10 @@ module MergeRequestsHelper
   end
 
   def mr_css_classes(mr)
-    classes = "merge-request"
+    classes = ["merge-request"]
-    classes << " closed" if mr.closed?
+    classes << "closed" if mr.closed?
-    classes << " merged" if mr.merged?
+    classes << "merged" if mr.merged?
-    classes
+    classes.join(' ')
   end
 
   def ci_build_details_path(merge_request)

app/helpers/milestones_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MilestonesHelper
   include EntityDateHelper
 
@@ -119,20 +121,18 @@ module MilestonesHelper
     title = date_type == :start ? "Start date" : "End date"
 
     if date
-      time_ago = time_ago_in_words(date)
+      time_ago = time_ago_in_words(date).sub("about ", "")
-      time_ago.slice!("about ")
+      state = if date.past?
-
+                "ago"
-      time_ago << if date.past?
+              else
-                    " ago"
+                "remaining"
-                  else
+              end
-                    " remaining"
-                  end
 
       content = [
         title,
         "<br />",
         date.to_s(:medium),
-        "(#{time_ago})"
+        "(#{time_ago} #{state})"
       ].join(" ")
 
       content.html_safe

app/helpers/milestones_routing_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MilestonesRoutingHelper
   def milestone_path(milestone, *args)
     if milestone.group_milestone?

app/helpers/mirror_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MirrorHelper
   def mirrors_form_data_attributes
     { project_mirror_endpoint: project_mirror_path(@project) }

app/helpers/namespaces_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NamespacesHelper
   def namespace_id_from(params)
     params.dig(:project, :namespace_id) || params[:namespace_id]

app/helpers/nav_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NavHelper
   def header_links
     @header_links ||= get_header_links

app/helpers/notes_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NotesHelper
   def note_target_fields(note)
     if note.noteable

app/helpers/notifications_helper.rb

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

app/helpers/numbers_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersHelper
   def limited_counter_with_delimiter(resource, **options)
     limit = options.fetch(:limit, 1000).to_i

app/helpers/page_layout_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PageLayoutHelper
   def page_title(*titles)
     @page_title ||= []
@@ -65,14 +67,14 @@ module PageLayoutHelper
   end
 
   def page_card_meta_tags
-    tags = ''
+    tags = []
 
     page_card_attributes.each_with_index do |pair, i|
       tags << tag(:meta, property: "twitter:label#{i + 1}", content: pair[0])
       tags << tag(:meta, property: "twitter:data#{i + 1}",  content: pair[1])
     end
 
-    tags.html_safe
+    tags.join.html_safe
   end
 
   def header_title(title = nil, title_url = nil)
@@ -115,16 +117,16 @@ module PageLayoutHelper
   end
 
   def container_class
-    css_class = "container-fluid"
+    css_class = ["container-fluid"]
 
     unless fluid_layout
-      css_class += " container-limited"
+      css_class << "container-limited"
     end
 
     if blank_container
-      css_class += " container-blank"
+      css_class << "container-blank"
     end
 
-    css_class
+    css_class.join(' ')
   end
 end

app/helpers/pagination_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PaginationHelper
   def paginate_collection(collection, remote: nil)
     if collection.is_a?(Kaminari::PaginatableWithoutCount)

app/helpers/performance_bar_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PerformanceBarHelper
   # This is a hack since using `alias_method :performance_bar_enabled?, :peek_enabled?`
   # in WithPerformanceBar breaks tests (but works in the browser).

app/helpers/pipeline_schedules_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PipelineSchedulesHelper
   def timezone_data
     ActiveSupport::TimeZone.all.map do |timezone|

app/helpers/preferences_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Helper methods for per-User preferences
 module PreferencesHelper
   def layout_choices

app/helpers/profiles_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ProfilesHelper
   def attribute_provider_label(attribute)
     user_synced_attributes_metadata = current_user.user_synced_attributes_metadata

app/helpers/projects_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ProjectsHelper
   def link_to_project(project)
     link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do
@@ -50,7 +52,7 @@ module ProjectsHelper
 
     return "(deleted)" unless author
 
-    author_html = ""
+    author_html = []
 
     # Build avatar image tag
     author_html << link_to_member_avatar(author, opts) if opts[:avatar]
@@ -60,7 +62,7 @@ module ProjectsHelper
 
     author_html << capture(&block) if block
 
-    author_html = author_html.html_safe
+    author_html = author_html.join.html_safe
 
     if opts[:name]
       link_to(author_html, user_path(author), class: "author-link #{"#{opts[:extra_class]}" if opts[:extra_class]} #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
@@ -80,15 +82,8 @@ module ProjectsHelper
       end
 
     project_link = link_to project_path(project) do
-      output =
+      icon = project_icon(project, alt: project.name, class: 'avatar-tile', width: 15, height: 15) if project.avatar_url && !Rails.env.test?
-        if project.avatar_url && !Rails.env.test?
+      [icon, content_tag("span", simple_sanitize(project.name), class: "breadcrumb-item-text js-breadcrumb-item-text")].join.html_safe
-          project_icon(project, alt: project.name, class: 'avatar-tile', width: 15, height: 15)
-        else
-          ""
-        end
-
-      output << content_tag("span", simple_sanitize(project.name), class: "breadcrumb-item-text js-breadcrumb-item-text")
-      output.html_safe
     end
 
     namespace_link = breadcrumb_list_item(namespace_link) unless project.group

app/helpers/repository_languages_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RepositoryLanguagesHelper
   def repository_languages_bar(languages)
     return if languages.none?

app/helpers/rss_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RssHelper
   def rss_url_options
     { format: :atom, feed_token: current_user.try(:feed_token) }

app/helpers/runners_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RunnersHelper
   def runner_status_icon(runner)
     status = runner.status

app/helpers/safe_params_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SafeParamsHelper
   # Rails 5.0 requires to permit `params` if they're used in url helpers.
   # Use this helper when generating links with `params.merge(...)`

app/helpers/search_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SearchHelper
   def search_autocomplete_opts(term)
     return unless current_user

app/helpers/selects_helper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module SelectsHelper
   def users_select_tag(id, opts = {})
-    css_class = "ajax-users-select "
+    css_class = ["ajax-users-select"]
-    css_class << "multiselect " if opts[:multiple]
+    css_class << "multiselect" if opts[:multiple]
-    css_class << "skip_ldap " if opts[:skip_ldap]
+    css_class << "skip_ldap" if opts[:skip_ldap]
     css_class << (opts[:class] || '')
     value = opts[:selected] || ''
     html = {
-      class: css_class,
+      class: css_class.join(' '),
       data: users_select_data_attributes(opts)
     }
 
@@ -24,20 +26,21 @@ module SelectsHelper
   end
 
   def groups_select_tag(id, opts = {})
-    opts[:class] ||= ''
+    classes = Array.wrap(opts[:class])
-    opts[:class] << ' ajax-groups-select'
+    classes << 'ajax-groups-select'
+
+    opts[:class] = classes.join(' ')
+
     select2_tag(id, opts)
   end
 
   def namespace_select_tag(id, opts = {})
-    opts[:class] ||= ''
+    opts[:class] = [*opts[:class], 'ajax-namespace-select'].join(' ')
-    opts[:class] << ' ajax-namespace-select'
     select2_tag(id, opts)
   end
 
   def project_select_tag(id, opts = {})
-    opts[:class] ||= ''
+    opts[:class] = [*opts[:class], 'ajax-project-select'].join(' ')
-    opts[:class] << ' ajax-project-select'
 
     unless opts.delete(:scope) == :all
       if @group
@@ -57,7 +60,10 @@ module SelectsHelper
   end
 
   def select2_tag(id, opts = {})
-    opts[:class] << ' multiselect' if opts[:multiple]
+    klass_opts = [opts[:class]]
+    klass_opts << 'multiselect' if opts[:multiple]
+
+    opts[:class] = klass_opts.join(' ')
     value = opts[:selected] || ''
 
     hidden_field_tag(id, value, opts)

app/helpers/sentry_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SentryHelper
   def sentry_enabled?
     Gitlab::Sentry.enabled?

app/helpers/services_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ServicesHelper
   def service_event_description(event)
     case event

app/helpers/sidekiq_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SidekiqHelper
   SIDEKIQ_PS_REGEXP = %r{\A
     (?<pid>\d+)\s+

app/helpers/snippets_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SnippetsHelper
   def reliable_snippet_path(snippet, opts = nil)
     if snippet.project_id?

app/helpers/sorting_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SortingHelper
   def sort_options_hash
     {

app/helpers/storage_health_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module StorageHealthHelper
   def failing_storage_health_message(storage_health)
     storage_name = content_tag(:strong, h(storage_health.storage_name))

app/helpers/storage_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module StorageHelper
   def storage_counter(size_in_bytes)
     precision = size_in_bytes < 1.megabyte ? 0 : 1

app/helpers/submodule_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SubmoduleHelper
   extend self
 

app/helpers/system_note_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SystemNoteHelper
   ICON_NAMES_BY_ACTION = {
     'commit' => 'commit',

app/helpers/tab_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TabHelper
   # Navigation link helper
   #
@@ -47,9 +49,7 @@ module TabHelper
     # Add our custom class into the html_options, which may or may not exist
     # and which may or may not already have a :class key
     o = options.delete(:html_options) || {}
-    o[:class] ||= ''
+    o[:class] = [*o[:class], klass].join(' ').strip
-    o[:class] += ' ' + klass
-    o[:class].strip!
 
     if block_given?
       content_tag(:li, capture(&block), o)

app/helpers/tags_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TagsHelper
   def tag_path(tag)
     "/tags/#{tag}"
@@ -14,12 +16,13 @@ module TagsHelper
   end
 
   def tag_list(project)
-    html = ''
+    html = []
+
     project.tag_list.each do |tag|
       html << link_to(tag, tag_path(tag))
     end
 
-    html.html_safe
+    html.join.html_safe
   end
 
   def protected_tag?(project, tag)

app/helpers/time_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TimeHelper
   def time_interval_in_words(interval_in_seconds)
     interval_in_seconds = interval_in_seconds.to_i

app/helpers/todos_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TodosHelper
   def todos_pending_count
     @todos_pending_count ||= current_user.todos_pending_count
@@ -94,9 +96,7 @@ module TodosHelper
       end
     end
 
-    path = request.path
+    "#{request.path}?#{options.to_param}"
-    path << "?#{options.to_param}"
-    path
   end
 
   def todo_actions_options
@@ -152,10 +152,11 @@ module TodosHelper
         ''
       end
 
-    html = "&middot; ".html_safe
+    content = content_tag(:span, class: css_class) do
-    html << content_tag(:span, class: css_class) do
       "Due #{is_due_today ? "today" : todo.target.due_date.to_s(:medium)}"
     end
+
+    "&middot; #{content}".html_safe
   end
 
   private

app/helpers/tree_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TreeHelper
   FILE_LIMIT = 1_000
 
@@ -8,7 +10,7 @@ module TreeHelper
   def render_tree(tree)
     # Sort submodules and folders together by name ahead of files
     folders, files, submodules = tree.trees, tree.blobs, tree.submodules
-    tree = ''
+    tree = []
     items = (folders + submodules).sort_by(&:name) + files
 
     if items.size > FILE_LIMIT
@@ -18,7 +20,7 @@ module TreeHelper
     end
 
     tree << render(partial: 'projects/tree/tree_row', collection: items) if items.present?
-    tree.html_safe
+    tree.join.html_safe
   end
 
   # Return an image icon depending on the file type and mode

app/helpers/triggers_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TriggersHelper
   def builds_trigger_url(project_id, ref: nil)
     if ref.nil?

app/helpers/user_callouts_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UserCalloutsHelper
   GKE_CLUSTER_INTEGRATION = 'gke_cluster_integration'.freeze
   GCP_SIGNUP_OFFER = 'gcp_signup_offer'.freeze

app/helpers/users_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UsersHelper
   def user_link(user)
     link_to(user.name, user_path(user),

app/helpers/version_check_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VersionCheckHelper
   def version_status_badge
     return unless Rails.env.production?

app/helpers/visibility_level_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VisibilityLevelHelper
   def visibility_level_color(level)
     case level
@@ -82,7 +84,7 @@ module VisibilityLevelHelper
   def disallowed_project_visibility_level_description(level, project)
     level_name = Gitlab::VisibilityLevel.level_name(level).downcase
     reasons = []
-    instructions = ''
+    instructions = []
 
     unless project.visibility_level_allowed_as_fork?(level)
       reasons << "the fork source project has lower visibility"
@@ -96,7 +98,7 @@ module VisibilityLevelHelper
     end
 
     reasons = reasons.any? ? ' because ' + reasons.to_sentence : ''
-    "This project cannot be #{level_name}#{reasons}.#{instructions}".html_safe
+    "This project cannot be #{level_name}#{reasons}.#{instructions.join}".html_safe
   end
 
   # Note: these messages closely mirror the form validation strings found in the group
@@ -104,7 +106,7 @@ module VisibilityLevelHelper
   def disallowed_group_visibility_level_description(level, group)
     level_name = Gitlab::VisibilityLevel.level_name(level).downcase
     reasons = []
-    instructions = ''
+    instructions = []
 
     unless group.visibility_level_allowed_by_projects?(level)
       reasons << "it contains projects with higher visibility"
@@ -122,7 +124,7 @@ module VisibilityLevelHelper
     end
 
     reasons = reasons.any? ? ' because ' + reasons.to_sentence : ''
-    "This group cannot be #{level_name}#{reasons}.#{instructions}".html_safe
+    "This group cannot be #{level_name}#{reasons}.#{instructions.join}".html_safe
   end
 
   def visibility_icon_description(form_model)

app/helpers/webpack_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebpackHelper
   def webpack_bundle_tag(bundle)
     javascript_include_tag(*webpack_entrypoint_paths(bundle))

app/helpers/wiki_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WikiHelper
   include API::Helpers::RelatedResourcesHelpers
 

app/helpers/workhorse_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Helpers to send Git blobs, diffs, patches or archives through Workhorse.
 # Workhorse will also serve files when using `send_file`.
 module WorkhorseHelper