diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-10 22:56:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 22:56:36 +0100 |
| commit | dc02a93d04815c618dc55748fff3cfe64c7023d9 (patch) | |
| tree | 5b6d56d248379823660d70dc35c95e4c547f43ea /app/helpers/application_helper.rb | |
| parent | 76b4e7727b7497c1b68e06133831701f8950ae19 (diff) | |
| parent | 87419f9307f54755af4604876ac149262ae3f0a6 (diff) | |
Merge pull request #2105 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index af453825b..774643625 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -67,7 +67,7 @@ module ApplicationHelper def link_to_login(name = nil, html_options = nil, &block) target = new_user_session_path - html_options = name if block_given? + html_options = name if block if omniauth_only? && Devise.mappings[:user].omniauthable? && User.omniauth_providers.size == 1 target = omniauth_authorize_path(:user, User.omniauth_providers[0]) @@ -75,7 +75,7 @@ module ApplicationHelper html_options[:method] = :post end - if block_given? + if block link_to(target, html_options, &block) else link_to(name, target, html_options) |