diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-02 09:49:38 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-02 09:49:38 +0200 |
| commit | 25a46d9e5999682f2a9bba3492f5497d1e0ce0bc (patch) | |
| tree | 776495c28dcc1e75ceacdfcbe801ab7344978b88 /app/helpers | |
| parent | c1d0a6a7981b5fe74bdd03c958a558096ea3cde8 (diff) | |
| parent | 1485bd9b4bf407d1051a6b160d2530c9ca93f10b (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b26e68c4d..a4023733c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -83,7 +83,8 @@ module ApplicationHelper end def provider_sign_in_link(provider) - link_to I18n.t("auth.providers.#{provider}", default: provider.to_s.chomp('_oauth2').capitalize), omniauth_authorize_path(:user, provider), class: "button button-#{provider}", method: :post + label = Devise.omniauth_configs[provider]&.strategy&.display_name.presence || I18n.t("auth.providers.#{provider}", default: provider.to_s.chomp('_oauth2').capitalize) + link_to label, omniauth_authorize_path(:user, provider), class: "button button-#{provider}", method: :post end def open_deletion? |