summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-08-21 16:04:52 -0300
committerMarcia Ramos <virtua.creative@gmail.com>2017-08-21 16:04:52 -0300
commit2eb07aecc93973983c4fc1ce1820b6155e3175ce (patch)
treef4a1797cf0ed49f9e65abc337c35ee2bb695ef15
parent905caab81a95d89f8426b8bbe530d843dd718354 (diff)
downloadgitlab-ce-2eb07aecc93973983c4fc1ce1820b6155e3175ce.tar.gz
copyedit
-rw-r--r--doc/user/group/index.md7
-rw-r--r--doc/user/project/issues/index.md21
-rw-r--r--doc/user/project/merge_requests/index.md14
-rw-r--r--doc/user/search/index.md4
4 files changed, 25 insertions, 21 deletions
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index a89acd907b7..fbc05261a32 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -55,12 +55,11 @@ By doing so:
- John mentions everyone from his team with `@john-team`
- John mentions only his marketing team with `@john-team/marketing`
-## Group-level list views of issues and merge requests
+## Issues and merge requests within a group
Issues and merge requests are part of projects. For a given group, view all the
-issues across all the projects in that group, together in a single list view. This
-is the [group-level issue list view](../project/issues/index.md#issue-list-views-searching-and-filtering).
-Similarly, there is a [group-level merge request list view](../project/merge_requests/index.md#merge-request-list-views-searching-and-filtering).
+[issues](../project/issues/index.md#issues-per-group) and [merge requests](../project/merge_requests/index.md#merge-requests-per-group) across all the projects in that group,
+together in a single list view.
## Create a new group
diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md
index 05d2b315c66..67f0230b36d 100644
--- a/doc/user/project/issues/index.md
+++ b/doc/user/project/issues/index.md
@@ -7,7 +7,7 @@ of solving a problem.
It allows you, your team, and your collaborators to share
and discuss proposals before and while implementing them.
-GitLab issues is available in all
+GitLab Issues and the GitLab Issue Tracker are available in all
[GitLab Products](https://about.gitlab.com/products/) as
part of the [GitLab Workflow](https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/).
@@ -46,14 +46,23 @@ Create [issue templates](#issue-templates) to make collaboration consistent and
containing all information you need. For example, you can create a template
for feature proposals and another one for bug reports.
-## Issue list views, searching, and filtering
+## Issue Tracker
-View all the issues within a project by navigating to **Project > Issues**.
-There are tabs to quickly filter by open and closed issues.
+The Issue Tracker is the collection of opened and closed issues created in a project.
+It is available for all projects, from the moment the project is created.
+
+Find the issue tracker by navigating to your **Project's homepage** > **Issues**.
+
+### Issues per project
+
+When you access your project's issues, GitLab will present them in a list,
+and you can use the tabs available to quickly filter by open and closed issues.
![Project issues list view](img/project_issues_list_view.png)
-[Search and filter the results](../../search/index.md#issues-and-merge-requests-per-project).
+You can also [search and filter](../../search/index.md#issues-and-merge-requests-per-project) the results more deeply with GitLab's search capacities.
+
+### Issues per group
View all the issues in a group (that is, all the issues across all projects in that
group) by navigating to **Group > Issues**. This view also has the open and closed
@@ -61,8 +70,6 @@ issue tabs.
![Group Issues list view](img/group_issues_list_view.png)
-[Search and filter the results](../../search/index.md#issues-and-merge-requests-per-group).
-
## GitLab Issues Functionalities
The image bellow illustrates how an issue looks like:
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index cd52471922f..285c40729fe 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -56,24 +56,23 @@ B. Consider you're a web developer writing a webpage for your company's:
1. Once approved, your merge request is [squashed and merged](https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html), and [deployed to staging with GitLab Pages](https://about.gitlab.com/2016/08/26/ci-deployment-and-environments/) (Squash and Merge is available in GitLab Enterprise Edition Starter)
1. Your production team [cherry picks](#cherry-pick-changes) the merge commit into production
+## Merge requests per project
-## Merge request list views, searching, and filtering
+View all the merge requests within a project by navigating to **Project > Merge Requests**.
-View all the merge requests within a project by navigating to **Project > Merge Requests**.
-There are tabs to quickly filter by open, merged, and closed merge requests.
+When you access your project's merge requests, GitLab will present them in a list,
+and you can use the tabs available to quickly filter by open and closed. You can also [search and filter the results](../../search/index.md#issues-and-merge-requests-per-project).
![Project merge requests list view](img/project_merge_requests_list_view.png)
-[Search and filter the results](../../search/index.md#issues-and-merge-requests-per-project).
+## Merge requests per group
View all the merge requests in a group (that is, all the merge requests across all projects in that
group) by navigating to **Group > Merge Requests**. This view also has the open, merged, and closed
-merge request tabs.
+merge request tabs, from which you can [search and filter the results](../../search/index.md#issues-and-merge-requests-per-group).
![Group Issues list view](img/group_merge_requests_list_view.png)
-[Search and filter the results](../../search/index.md#issues-and-merge-requests-per-group).
-
## Authorization for merge requests
There are two main ways to have a merge request flow with GitLab:
@@ -159,7 +158,6 @@ all your changes will be available to preview by anyone with the Review Apps lin
[Read more about Review Apps.](../../../ci/review_apps/index.md)
-
## Tips
Here are some tips that will help you be more efficient with merge requests in
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index 52af864d54e..f5c7ce49e8e 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -27,7 +27,7 @@ on the search field on the top-right of your screen:
![shortcut to your issues and mrs](img/issues_mrs_shortcut.png)
-## Issues and merge requests per project
+### Issues and merge requests per project
If you want to search for issues present in a specific project, navigate to
a project's **Issues** tab, and click on the field **Search or filter results...**. It will
@@ -40,7 +40,7 @@ The same process is valid for merge requests. Navigate to your project's **Merge
and click **Search or filter results...**. Merge requests can be filtered by author, assignee,
milestone, and label.
-## Issues and merge requests per group
+### Issues and merge requests per group
Similar to **Issues and merge requests per project**, you can also search for issues
within a group. Navigate to a group's **Issues** tab and query search results in