diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-20 19:47:03 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-20 19:47:03 +0200 |
| commit | 5aeb80537eebb36a1b07ddbb189267ffc293f957 (patch) | |
| tree | 718e228db71c00537c624290c33f9c4e25af110b /doc | |
| parent | 549540f100b978f29a872af2a3bf74e81383de16 (diff) | |
| parent | a9786733621f42affb8cb77bfe19a78f6c6d33d9 (diff) | |
| download | gitlab-ce-5aeb80537eebb36a1b07ddbb189267ffc293f957.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/raketasks/README.md | 3 | ||||
| -rw-r--r-- | doc/update/7.5-to-7.6.md | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/raketasks/README.md b/doc/raketasks/README.md index 9e2f697bca6..770b7a70fe0 100644 --- a/doc/raketasks/README.md +++ b/doc/raketasks/README.md @@ -1,5 +1,8 @@ +# Rake tasks + - [Backup restore](backup_restore.md) - [Cleanup](cleanup.md) +- [Features](features.md) - [Maintenance](maintenance.md) and self-checks - [User management](user_management.md) - [Web hooks](web_hooks.md) diff --git a/doc/update/7.5-to-7.6.md b/doc/update/7.5-to-7.6.md index 11058c211ca..35cd437fdc4 100644 --- a/doc/update/7.5-to-7.6.md +++ b/doc/update/7.5-to-7.6.md @@ -70,7 +70,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`. ``` -git diff origin/7-6-stable:config/gitlab.yml.example origin/7-6-stable:config/gitlab.yml.example +git diff origin/7-5-stable:config/gitlab.yml.example origin/7-6-stable:config/gitlab.yml.example ``` #### Change Nginx settings |