root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Hannes Rosenögger 2015-10-12 07:23:21 +00:00
parent 42603af326 4ee8888498
commit 5ffbf5feb7
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
doc/customization/welcome_message.md
View File

@ -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