diff options
Diffstat (limited to 'app/helpers/appearances_helper.rb')
| -rw-r--r-- | app/helpers/appearances_helper.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb index e9465e0db22..5beefbb943c 100644 --- a/app/helpers/appearances_helper.rb +++ b/app/helpers/appearances_helper.rb @@ -53,8 +53,12 @@ module AppearancesHelper image_path('logo.svg') end - def brand_text - markdown_field(current_appearance, :description) + def custom_sign_in_description + [ + markdown_field(current_appearance, :description), + markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text), + markdown(Gitlab::CurrentSettings.help_text) + ].compact_blank.join("<br>").html_safe end def brand_new_project_guidelines |