Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
b6438aa8
Commit
b6438aa8
authored
Nov 14, 2018
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add docs on post-merge pipelines
parent
078fab66
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
2 deletions
+30
-2
doc/user/project/merge_requests/img/merge_request_pipeline.png
...ser/project/merge_requests/img/merge_request_pipeline.png
+0
-0
doc/user/project/merge_requests/index.md
doc/user/project/merge_requests/index.md
+30
-2
No files found.
doc/user/project/merge_requests/img/merge_request_pipeline.png
0 → 100644
View file @
b6438aa8
30.3 KB
doc/user/project/merge_requests/index.md
View file @
b6438aa8
...
...
@@ -168,7 +168,7 @@ administrator to do so.
### Adding patches when creating a merge request via e-mail
>
**Note**: This feature was [implemented in GitLab 11.5](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22723)
>
[Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22723) in GitLab 11.5.
You can add commits to the merge request being created by adding
patches as attachments to the email, all attachments with a filename
...
...
@@ -185,7 +185,7 @@ branch already exists, the patches will be applied on top of it.
## Find the merge request that introduced a change
>
**Note**: this feature was [implemented in GitLab 10.5](https://gitlab.com/gitlab-org/gitlab-ce/issues/2383)
.
>
[Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/2383) in GitLab 10.5
.
When viewing the commit details page, GitLab will link to the merge request (or
merge requests, if it's in more than one) containing that commit.
...
...
@@ -249,6 +249,34 @@ 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
)
## Pipeline status in merge requests
If you've set up
[
GitLab CI/CD
](
../../../ci/README.md
)
in your project,
you will be able to see:
-
Both pre and post-merge pipelines and the environment information if any.
-
Which deployments are in progress.
If there's an
[
environment
](
../../../ci/environments.md
)
and the application is
successfully deployed to it, the deployed environment and the link to the
Review App will be shown as well.
### Post-merge pipeline status
When a merge request is merged, you can see the post-merge pipeline status of
the branch the merge request was merged into. For example, when a merge request
is merged into the master branch and then triggers a deployment to the staging
environment.
Deployments that are ongoing will be shown, as well as the deploying/deployed state
for environments. If it's the first time the branch is deployed, the link
will return a
`404`
error until done. During the deployment, the stop button will
be disabled. If the pipeline fails to deploy, the deployment info will be hidden.
![
Merge request pipeline
](
img/merge_request_pipeline.png
)
For more information,
[
read about pipelines
](
../../../ci/pipelines.md
)
.
## Bulk editing merge requests
Find out about
[
bulk editing merge requests
](
../../project/bulk_editing.md
)
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment