about summary refs log tree commit diff
path: root/app/helpers
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-01-28 09:38:44 +0100
committerGitHub <noreply@github.com>2022-01-28 09:38:44 +0100
commit2ba6267f1603cee682bfe3885b797ad5df7e958f (patch)
tree60586262894c6aadf5722a53ce560c9b05c3e974 /app/helpers
parent58930199379305e718d57b48488cc752b452e72a (diff)
parent94a39f6b68e236993fe5b89a697b17c8535f6ea0 (diff)
Merge pull request #1668 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f4963ce99..8b41033a5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -64,6 +64,8 @@ module ApplicationHelper
   def link_to_login(name = nil, html_options = nil, &block)
     target = new_user_session_path
 
+    html_options = name if block_given?
+
     if omniauth_only? && Devise.mappings[:user].omniauthable? && User.omniauth_providers.size == 1
       target = omniauth_authorize_path(:user, User.omniauth_providers[0])
       html_options ||= {}