From 265d7da50078d5ba95fbe6131abc1da445f8871c Mon Sep 17 00:00:00 2001 From: Valery Sizov <valery@gitlab.com> Date: Wed, 30 May 2018 21:17:27 +0300 Subject: [PATCH] resolve doc/user/project/merge_requests/index.md --- doc/user/project/merge_requests/index.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index e09aee8d18b..c0380811ae5 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -33,10 +33,8 @@ With GitLab merge requests, you can: With **[GitLab Enterprise Edition][ee]**, you can also: -<<<<<<< HEAD - View the deployment process across projects with [Multi-Project Pipeline Graphs](../../../ci/multi_project_pipeline_graphs.md#multi-project-pipeline-graphs) **[PREMIUM]** - Request [approvals](merge_request_approvals.md) from your managers **[STARTER]** -- [Squash and merge](squash_and_merge.md) for a cleaner commit history **[STARTER]** - Analyze the impact of your changes with [Code Quality reports](code_quality_diff.md) **[STARTER]** - Manage the licenses of your dependencies with [License Management](#license-management) **[ULTIMATE]** - Analyze your source code for vulnerabilities with [Static Application Security Testing](sast.md) **[ULTIMATE]** @@ -44,11 +42,6 @@ With **[GitLab Enterprise Edition][ee]**, you can also: - Analyze your dependencies for vulnerabilities with [Dependency Scanning](dependency_scanning.md) **[ULTIMATE]** - Analyze your Docker images for vulnerabilities with [Container Scanning](container_scanning.md) **[ULTIMATE]** - Determine the performance impact of changes with [Browser Performance Testing](#browser-performance-testing) **[PREMIUM]** -======= -- View the deployment process across projects with [Multi-Project Pipeline Graphs](https://docs.gitlab.com/ee/ci/multi_project_pipeline_graphs.html#multi-project-pipeline-graphs) **[PREMIUM]** -- Request [approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your managers **[STARTER]** -- Analyze the impact of your changes with [Code Quality reports](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html) **[STARTER]** ->>>>>>> upstream/master ## Use cases @@ -69,13 +62,8 @@ B. Consider you're a web developer writing a webpage for your company's website: 1. You gather feedback from your reviewers 1. Your changes are previewed with [Review Apps](../../../ci/review_apps/index.md) 1. You request your web designers for their implementation -<<<<<<< HEAD 1. You request the [approval](merge_request_approvals.md) from your manager **[STARTER]** -1. Once approved, your merge request is [squashed and merged](squash_and_merge.md), 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 Starter) -======= -1. You request the [approval](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your manager **[STARTER]** 1. Once approved, your merge request is [squashed and merged](squash_and_merge.md), and [deployed to staging with GitLab Pages](https://about.gitlab.com/2016/08/26/ci-deployment-and-environments/) ->>>>>>> upstream/master 1. Your production team [cherry picks](#cherry-pick-changes) the merge commit into production ## Merge requests per project -- 2.30.9