Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2021-02-03 17:02:48 +01:00
33 changed files with 453 additions and 319 deletions

View File

@@ -1,5 +1,5 @@
if String.method_defined?(:blank_as?)
class String
alias_method :blank?, :blank_as?
alias blank? blank_as?
end
end

View File

@@ -1,7 +1,7 @@
# Use this setup block to configure all options available in SimpleForm.
module AppendComponent
def append(wrapper_options = nil)
def append(_wrapper_options = nil)
@append ||= begin
options[:append].to_s.html_safe if options[:append].present?
end
@@ -9,7 +9,7 @@ module AppendComponent
end
module RecommendedComponent
def recommended(wrapper_options = nil)
def recommended(_wrapper_options = nil)
return unless options[:recommended]
options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) }
nil

View File

@@ -75,7 +75,7 @@ module Twitter
# XMPP or magnet URIs an empty array will be returned.
#
# If a block is given then it will be called for each XMPP URI.
def extract_extra_uris_with_indices(text, options = {}) # :yields: uri, start, end
def extract_extra_uris_with_indices(text, _options = {}) # :yields: uri, start, end
return [] unless text && text.index(":")
urls = []