diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-10-12 07:23:21 +0000 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-10-12 07:23:21 +0000 |
| commit | 5ffbf5feb7577ec3affc32992c79cddca3036c4d (patch) | |
| tree | 3256f99ea4fa8ff886fd47fe47f6157da6e070ad | |
| parent | 42603af3267bd1be0dcd18927d74bfc19a894c04 (diff) | |
| parent | 4ee8888498d7fc3921326d4929cf0b57e64411f4 (diff) | |
| download | gitlab-ce-5ffbf5feb7577ec3affc32992c79cddca3036c4d.tar.gz | |
Merge branch 'docs-update' into 'master'
removed extra_sign_in_text examples for gitlab.rb [ci skip]
I removed the extra_sign_in_text option documentation. This is no longer needed because a welcome message aka. extra_sign_in_text can now be set/changed in the admin UI.
Admin area > Settings
This was mentioned in issue #3006
See merge request !1565
| -rw-r--r-- | doc/customization/welcome_message.md | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/doc/customization/welcome_message.md b/doc/customization/welcome_message.md index 6c141d1fb7a..e993230bb88 100644 --- a/doc/customization/welcome_message.md +++ b/doc/customization/welcome_message.md @@ -8,31 +8,5 @@ It is possible to add a markdown-formatted welcome message to your GitLab sign-in page. Users of GitLab Enterprise Edition should use the [branded login page feature](/ee/customization/branded_login_page.html) instead. -## Omnibus-gitlab example - -In `/etc/gitlab/gitlab.rb`: - -```ruby -gitlab_rails['extra_sign_in_text'] = <<'EOS' -# ACME GitLab -Welcome to the [ACME](http://www.example.com) GitLab server! -EOS -``` - -Run `sudo gitlab-ctl reconfigure` for changes to take effect. - -## Installation from source - -In `/home/git/gitlab/config/gitlab.yml`: - -```yaml -# snip -production: - # snip - extra: - sign_in_text: | - # ACME GitLab - Welcome to the [ACME](http://www.example.com) GitLab server! -``` - -Run `sudo service gitlab reload` for the change to take effect. +The welcome message (extra_sign_in_text) can now be set/changed in the Admin UI. +Admin area > Settings
\ No newline at end of file |