diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index 6ce733f25..1c3adbd78 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -50,7 +50,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController resource.registration_form_time = session[:registration_form_time] resource.sign_up_ip = request.remote_ip - resource.current_sign_in_ip = request.remote_ip if resource.current_sign_in_ip.nil? resource.build_account if resource.account.nil? end diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb index 6adc0cc28..70a04fd08 100644 --- a/app/helpers/languages_helper.rb +++ b/app/helpers/languages_helper.rb @@ -2,9 +2,6 @@ module LanguagesHelper ISO_639_1 = { - squeak: ["Squeak", "Squeak"].freeze, - dog: ["Dog", "Dog"].freeze, - lion: ["Lion", "Lion"].freeze, aa: ['Afar', 'Afaraf'].freeze, ab: ['Abkhaz', 'аҧсуа бызшәа'].freeze, ae: ['Avestan', 'avesta'].freeze, @@ -38,6 +35,7 @@ module LanguagesHelper cy: ['Welsh', 'Cymraeg'].freeze, da: ['Danish', 'dansk'].freeze, de: ['German', 'Deutsch'].freeze, + dog: ["Dog", "Dog"].freeze, dv: ['Divehi', 'Dhivehi'].freeze, dz: ['Dzongkha', 'རྫོང་ཁ'].freeze, ee: ['Ewe', 'Eʋegbe'].freeze, @@ -99,6 +97,7 @@ module LanguagesHelper lb: ['Luxembourgish', 'Lëtzebuergesch'].freeze, lg: ['Ganda', 'Luganda'].freeze, li: ['Limburgish', 'Limburgs'].freeze, + lion: ["Lion", "Lion"].freeze, ln: ['Lingala', 'Lingála'].freeze, lo: ['Lao', 'ພາສາ'].freeze, lt: ['Lithuanian', 'lietuvių kalba'].freeze, @@ -152,6 +151,7 @@ module LanguagesHelper sn: ['Shona', 'chiShona'].freeze, so: ['Somali', 'Soomaaliga'].freeze, sq: ['Albanian', 'Shqip'].freeze, + squeak: ["Squeak", "Squeak"].freeze, sr: ['Serbian', 'српски језик'].freeze, ss: ['Swati', 'SiSwati'].freeze, st: ['Southern Sotho', 'Sesotho'].freeze, diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb index 0e0f2849c..f75da4489 100644 --- a/app/helpers/statuses_helper.rb +++ b/app/helpers/statuses_helper.rb @@ -65,14 +65,6 @@ module StatusesHelper embedded_view? ? '_blank' : nil end - def acct(account) - if account.local? - "@#{account.acct}@#{Rails.configuration.x.local_domain}" - else - "@#{account.acct}" - end - end - def text_formatting_classes case current_user&.setting_strip_formatting when 'none', nil diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js index 04aa75bb4..9b3d01cfd 100644 --- a/app/javascript/mastodon/features/compose/components/search_results.js +++ b/app/javascript/mastodon/features/compose/components/search_results.js @@ -103,16 +103,6 @@ class SearchResults extends ImmutablePureComponent {