diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-10-25 15:39:23 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-25 15:39:23 +0300 |
| commit | 47c5ecaff33f49cfdc5fd47f5baff9a13e3d3807 (patch) | |
| tree | 8352b7ec74351f1324956a4c7c34c32a812816f1 /doc/README.md | |
| parent | 188e1c261edf70685a7ea9e4276cd9794f2029c3 (diff) | |
| parent | e81d74b9253e4a9f48bad0071bf37075bb6a20c5 (diff) | |
| download | gitlab-ce-use-git-branch-merged.tar.gz | |
Merge remote-tracking branch 'upstream/master' into use-git-branch-mergeduse-git-branch-merged
* upstream/master: (56 commits)
Resolve "Remove overzealous tooltips in projects page tabs"
Remove filter icon from search bar
Don't rename groups/projects that aren't reserved anymore
Memoize GitLab logger to reduce open file descriptors
Update groups API documentation
Changing the smallest of typos
Remove `<script>` and `<template>` from CHANGELOG.md
Support `Gitaly::User`'s gl_username field
Fix icon color and btn-group alignment of discussion buttons
Simple docs fixes
Fix button type
Changes after review
fixed karma tests
Removes group_avatar & group_label_subscription from global namespace
Fix CSS in load more participants
Fix the description of the new branch created by an issue's new branch button
Fix a small typo in the delete merged branches documentation
spec fixes
Remove Sherlock usage from the performance bar
moved to eventHub to manage creating new files removed an ID from the CSS
...
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 c6500a37aa9..5eabc126b95 100644 --- a/doc/README.md +++ b/doc/README.md @@ -85,7 +85,7 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i ### Issues and Merge Requests (MRs) -- [Discussions](user/discussions/index.md) Threads, comments, and resolvable discussions in issues, commits, and merge requests. +- [Discussions](user/discussions/index.md): Threads, comments, and resolvable discussions in issues, commits, and merge requests. - [Issues](user/project/issues/index.md) - [Project issue Board](user/project/issue_board.md) - [Issues and merge requests templates](user/project/description_templates.md): Create templates for submitting new issues and merge requests. @@ -155,7 +155,7 @@ have access to GitLab administration tools and settings. - [Git LFS configuration](workflow/lfs/lfs_administration.md): Learn how to use LFS under GitLab. - [GitLab Pages configuration](administration/pages/index.md): Configure GitLab Pages. - [High Availability](administration/high_availability/README.md): Configure multiple servers for scaling or high availability. -- [User cohorts](user/admin_area/user_cohorts.md) View user activity over time. +- [User cohorts](user/admin_area/user_cohorts.md): View user activity over time. - [Web terminals](administration/integration/terminal.md): Provide terminal access to environments from within GitLab. - GitLab CI - [CI admin settings](user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration time. |