diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-10-07 01:01:42 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2016-10-07 04:54:26 +0300 |
| commit | 9920551536bb4f78dffeaaf3a194b92f54c34a47 (patch) | |
| tree | dad5b2d5f1b725e66d29d355c5095b6899546427 /app/views/devise | |
| parent | dd159a750b294ee89cb8a4143284ff9788b639fc (diff) | |
Enable CacheMarkdownField for the remaining models
This commit alters views for the following models to use the markdown cache if
present:
* AbuseReport
* Appearance
* ApplicationSetting
* BroadcastMessage
* Group
* Issue
* Label
* MergeRequest
* Milestone
* Project
At the same time, calls to `escape_once` have been moved into the `single_line`
Banzai pipeline, so they can't be missed out by accident and the work is done
at save, rather than render, time.
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/confirmations/almost_there.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/confirmations/almost_there.haml b/app/views/devise/confirmations/almost_there.haml index 73c3a3dd2eb..20cd7b0179d 100644 --- a/app/views/devise/confirmations/almost_there.haml +++ b/app/views/devise/confirmations/almost_there.haml @@ -3,9 +3,9 @@ Almost there... %p.lead Please check your email to confirm your account -- if after_sign_up_text.present? +- if current_application_settings.after_sign_up_text.present? .well-confirmation.text-center - = markdown(after_sign_up_text) + = markdown_field(current_application_settings, :after_sign_up_text) %p.confirmation-content.text-center No confirmation email received? Please check your spam folder or .append-bottom-20.prepend-top-20.text-center |