From bb99fc2572a796b938bd67128f6482c180e3942b Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Tue, 7 Mar 2017 21:32:36 +0100 Subject: Add nested groups documentation [ci skip] --- doc/workflow/README.md | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/workflow') diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 9e7ee47387c..a286a23765d 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -40,3 +40,4 @@ - [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md) - [Todos](todos.md) - [Snippets](../user/snippets.md) +- [Nested groups](../user/group/subgroups/index.md) -- cgit v1.2.1 From db8f6259abc0df40ef9c4016b30d14b33b2d13d0 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Wed, 15 Mar 2017 09:16:24 +0100 Subject: Change naming from nested groups to subgroups [ci skip] --- doc/workflow/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/workflow') diff --git a/doc/workflow/README.md b/doc/workflow/README.md index a286a23765d..6a8de51a199 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -40,4 +40,4 @@ - [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md) - [Todos](todos.md) - [Snippets](../user/snippets.md) -- [Nested groups](../user/group/subgroups/index.md) +- [Subgroups](../user/group/subgroups/index.md) -- cgit v1.2.1 From 03dabc522e937f091ad30cc40034ffd6d19c7011 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Fri, 10 Mar 2017 19:01:05 +0000 Subject: Allow filtering by all started milestones --- doc/workflow/milestones.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'doc/workflow') diff --git a/doc/workflow/milestones.md b/doc/workflow/milestones.md index dff36899aec..37afe553e55 100644 --- a/doc/workflow/milestones.md +++ b/doc/workflow/milestones.md @@ -1,13 +1,28 @@ # Milestones -Milestones allow you to organize issues and merge requests into a cohesive group, optionally setting a due date. +Milestones allow you to organize issues and merge requests into a cohesive group, optionally setting a due date. A common use is keeping track of an upcoming software version. Milestones are created per-project. ![milestone form](milestones/form.png) ## Groups and milestones -You can create a milestone for several projects in the same group simultaneously. +You can create a milestone for several projects in the same group simultaneously. On the group's milestones page, you will be able to see the status of that milestone across all of the selected projects. ![group milestone form](milestones/group_form.png) + +## Special milestone filters + +In addition to the milestones that exist in the project or group, there are some +special options available when filtering by milestone: + +* **No Milestone** - only show issues or merge requests without a milestone. +* **Upcoming** - show issues or merge request that belong to the next open + milestone with a due date, by project. (For example: if project A has + milestone v1 due in three days, and project B has milestone v2 due in a week, + then this will show issues or merge requests from milestone v1 in project A + and milestone v2 in project B.) +* **Started** - show issues or merge requests from any milestone with a start + date less than today. Note that this can return results from several + milestones in the same project. -- cgit v1.2.1 From a406918787fdfaa3313876456c40dfa96d51ecbf Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 17 Mar 2017 11:51:11 +0100 Subject: Refactor award emojis document [ci skip] --- doc/workflow/award_emoji.md | 66 +-------------------- doc/workflow/img/award_emoji_comment_awarded.png | Bin 19159 -> 0 bytes doc/workflow/img/award_emoji_comment_picker.png | Bin 72883 -> 0 bytes doc/workflow/img/award_emoji_select.png | Bin 23779 -> 0 bytes .../img/award_emoji_votes_least_popular.png | Bin 50191 -> 0 bytes .../img/award_emoji_votes_most_popular.png | Bin 48342 -> 0 bytes .../img/award_emoji_votes_sort_options.png | Bin 57145 -> 0 bytes 7 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 doc/workflow/img/award_emoji_comment_awarded.png delete mode 100644 doc/workflow/img/award_emoji_comment_picker.png delete mode 100644 doc/workflow/img/award_emoji_select.png delete mode 100644 doc/workflow/img/award_emoji_votes_least_popular.png delete mode 100644 doc/workflow/img/award_emoji_votes_most_popular.png delete mode 100644 doc/workflow/img/award_emoji_votes_sort_options.png (limited to 'doc/workflow') diff --git a/doc/workflow/award_emoji.md b/doc/workflow/award_emoji.md index 1df0698afd0..d74378cc564 100644 --- a/doc/workflow/award_emoji.md +++ b/doc/workflow/award_emoji.md @@ -1,65 +1 @@ -# Award emoji - ->**Note:** -[Introduced][1825] in GitLab 8.2. - -When you're collaborating online, you get fewer opportunities for high-fives -and thumbs-ups. Emoji can be awarded to issues and merge requests, making -virtual celebrations easier. - -![Award emoji](img/award_emoji_select.png) - -Award emoji make it much easier to give and receive feedback without a long -comment thread. Comments that are only emoji will automatically become -award emoji. - -## Sort issues and merge requests on vote count - ->**Note:** -[Introduced][2871] in GitLab 8.5. - -You can quickly sort issues and merge requests by the number of votes they -have received. The sort options can be found in the dropdown menu as "Most -popular" and "Least popular". - -![Votes sort options](img/award_emoji_votes_sort_options.png) - ---- - -Sort by most popular issues/merge requests. - -![Votes sort by most popular](img/award_emoji_votes_most_popular.png) - ---- - -Sort by least popular issues/merge requests. - -![Votes sort by least popular](img/award_emoji_votes_least_popular.png) - ---- - -The total number of votes is not summed up. An issue with 18 upvotes and 5 -downvotes is considered more popular than an issue with 17 upvotes and no -downvotes. - -## Award emoji for comments - ->**Note:** -[Introduced][4291] in GitLab 8.9. - -Award emoji can also be applied to individual comments when you want to -celebrate an accomplishment or agree with an opinion. - -To add an award emoji, click the smile in the top right of the comment and pick -an emoji from the dropdown. - -![Picking an emoji for a comment](img/award_emoji_comment_picker.png) - -![An award emoji has been applied to a comment](img/award_emoji_comment_awarded.png) - -If you want to remove an award emoji, just click the emoji again and the vote -will be removed. - -[2871]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2781 -[1825]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1825 -[4291]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4291 +This document was moved to [another location](../user/award_emojis.md). diff --git a/doc/workflow/img/award_emoji_comment_awarded.png b/doc/workflow/img/award_emoji_comment_awarded.png deleted file mode 100644 index 111793ebf8a..00000000000 Binary files a/doc/workflow/img/award_emoji_comment_awarded.png and /dev/null differ diff --git a/doc/workflow/img/award_emoji_comment_picker.png b/doc/workflow/img/award_emoji_comment_picker.png deleted file mode 100644 index 3ad1bab3119..00000000000 Binary files a/doc/workflow/img/award_emoji_comment_picker.png and /dev/null differ diff --git a/doc/workflow/img/award_emoji_select.png b/doc/workflow/img/award_emoji_select.png deleted file mode 100644 index e1b37beaf62..00000000000 Binary files a/doc/workflow/img/award_emoji_select.png and /dev/null differ diff --git a/doc/workflow/img/award_emoji_votes_least_popular.png b/doc/workflow/img/award_emoji_votes_least_popular.png deleted file mode 100644 index 86ede4b0c10..00000000000 Binary files a/doc/workflow/img/award_emoji_votes_least_popular.png and /dev/null differ diff --git a/doc/workflow/img/award_emoji_votes_most_popular.png b/doc/workflow/img/award_emoji_votes_most_popular.png deleted file mode 100644 index 1d3e2e57aa0..00000000000 Binary files a/doc/workflow/img/award_emoji_votes_most_popular.png and /dev/null differ diff --git a/doc/workflow/img/award_emoji_votes_sort_options.png b/doc/workflow/img/award_emoji_votes_sort_options.png deleted file mode 100644 index c6dc1b939c1..00000000000 Binary files a/doc/workflow/img/award_emoji_votes_sort_options.png and /dev/null differ -- cgit v1.2.1