Commit c872d330c558ed51b9b3e7f92b318e57221fd59e
1 parent
f3ef7fbc
Exists in
master
and in
11 other branches
Add configuration section for 'extra: sign_in_text' for gitlab.rb
Updated per: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/111#note_104615 Update #2: Preserve multi-line sign_in_text: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/111#note_104642 & https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/111#note_104669
Showing
1 changed file
with
6 additions
and
3 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
| @@ -238,10 +238,13 @@ production: &base | @@ -238,10 +238,13 @@ production: &base | ||
| 238 | # piwik_url: '_your_piwik_url' | 238 | # piwik_url: '_your_piwik_url' |
| 239 | # piwik_site_id: '_your_piwik_site_id' | 239 | # piwik_site_id: '_your_piwik_site_id' |
| 240 | 240 | ||
| 241 | + <% if @extra_sign_in_text %> | ||
| 241 | ## Text under sign-in page (Markdown enabled) | 242 | ## Text under sign-in page (Markdown enabled) |
| 242 | - # sign_in_text: | | ||
| 243 | - #  | ||
| 244 | - # [Learn more about CompanyName](http://www.companydomain.com/) | 243 | + sign_in_text: | |
| 244 | + <% @extra_sign_in_text.to_s.split("\n").each do |line| %> | ||
| 245 | + <%= line %> | ||
| 246 | + <% end %> | ||
| 247 | + <% end %> | ||
| 245 | 248 | ||
| 246 | development: | 249 | development: |
| 247 | <<: *base | 250 | <<: *base |