diff options
| author | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
| commit | b988faaf85c8e68d501f242b980e5e79a00e2b15 (patch) | |
| tree | faffbfe623bfcbfe1c09bddac00b2cc879baff63 /doc/README.md | |
| parent | 5af4cae544c8526de63e639bd6c7db730526add3 (diff) | |
| parent | 53db7d1d75e1d14cb20278bd0c1a75ce24a6626d (diff) | |
| download | gitlab-ce-b988faaf85c8e68d501f242b980e5e79a00e2b15.tar.gz | |
Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce
# Conflicts:
# db/schema.rb
Diffstat (limited to 'doc/README.md')
| -rw-r--r-- | doc/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/README.md b/doc/README.md index 6e94f1e8e87..78030ce4e72 100644 --- a/doc/README.md +++ b/doc/README.md @@ -19,10 +19,10 @@ - [Migrating from SVN](workflow/importing/migrating_from_svn.md) Convert a SVN repository to Git and GitLab. - [Permissions](user/permissions.md) Learn what each role in a project (external/guest/reporter/developer/master/owner) can do. - [Profile Settings](profile/README.md) -- [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat. +- [Project Services](user/project/integrations//project_services.md) Integrate a project with external services, such as CI and chat. - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects. - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects. -- [Webhooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project. +- [Webhooks](user/project/integrations/webhooks.md) Let GitLab notify you when new code has been pushed to your project. - [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN. - [Git Attributes](user/project/git_attributes.md) Managing Git attributes using a `.gitattributes` file. - [Git cheatsheet](https://gitlab.com/gitlab-com/marketing/raw/master/design/print/git-cheatsheet/print-pdf/git-cheatsheet.pdf) Download a PDF describing the most used Git operations. |