summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-03 20:18:40 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-03 20:18:40 +0000
commitcc83039a7044cf2c51c9909a11fd6dd422f88b8c (patch)
tree7b8244a69683be030e4cd76549d094542706ee9c /app
parentbc5837c048644232b12b49051e4bbcdc06fbba5b (diff)
parent5bfbb44622b8f1948b41855a4d43569de6104e4a (diff)
downloadgitlab-ce-cc83039a7044cf2c51c9909a11fd6dd422f88b8c.tar.gz
Merge branch '24133-custom-signin-text-alignment' into 'master'
Add custom text to column Before: ![Screen_Shot_2016-11-03_at_9.46.27_AM](/uploads/ba26761b1e1a5af30b19aac88c0060a1/Screen_Shot_2016-11-03_at_9.46.27_AM.png) After: ![Screen_Shot_2016-11-03_at_9.46.20_AM](/uploads/a959a30a3e11ab64bb1412e662692f2b/Screen_Shot_2016-11-03_at_9.46.20_AM.png) Closes #24133 See merge request !7269
Diffstat (limited to 'app')
-rw-r--r--app/views/layouts/devise.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 6922f1e153f..afd9958f073 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -26,8 +26,8 @@
Perform code reviews and enhance collaboration with merge requests.
Each project can also have an issue tracker and a wiki.
- - if current_application_settings.sign_in_text.present?
- = markdown_field(current_application_settings, :sign_in_text)
+ - if current_application_settings.sign_in_text.present?
+ = markdown_field(current_application_settings, :sign_in_text)
%hr.footer-fixed
.container.footer-container