OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Apply Rubocop Style/RedundantAssignment (#23452)

pull/21464/head
Nick Schonning 2023-02-08 01:06:50 -05:00 committed by GitHub
parent 1487fcde93
commit 8c1b65c7dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/concerns/omniauthable.rb
View File

@ -97,8 +97,7 @@ module Omniauthable
def ensure_valid_username(starting_username) def ensure_valid_username(starting_username)
starting_username = starting_username.split('@')[0] starting_username = starting_username.split('@')[0]
temp_username = starting_username.gsub(/[^a-z0-9_]+/i, '') temp_username = starting_username.gsub(/[^a-z0-9_]+/i, '')
validated_username = temp_username.truncate(30, omission: '') temp_username.truncate(30, omission: '')
validated_username
end end
end end
end end

3
app/models/setting.rb
View File

@ -23,7 +23,7 @@ class Setting < RailsSettings::Base
def [](key) def [](key)
return super(key) unless rails_initialized? return super(key) unless rails_initialized?
val = Rails.cache.fetch(cache_key(key, nil)) do Rails.cache.fetch(cache_key(key, nil)) do
db_val = object(key) db_val = object(key)
if db_val if db_val
@ -35,7 +35,6 @@ class Setting < RailsSettings::Base
default_settings[key] default_settings[key]
end end
end end
val
end end
def all_as_records def all_as_records