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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
66518762
Commit
66518762
authored
Dec 19, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
d5e9ebd2
00096b52
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
17 deletions
+35
-17
doc/ci/merge_request_pipelines/index.md
doc/ci/merge_request_pipelines/index.md
+15
-16
doc/ssh/README.md
doc/ssh/README.md
+20
-1
No files found.
doc/ci/merge_request_pipelines/index.md
View file @
66518762
# Pipelines for merge requests
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/15310) in GitLab 11.6
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/15310) in GitLab 11.6
.
Usually, when
a developer creates
a new merge request, a pipeline runs on the
Usually, when
you create
a new merge request, a pipeline runs on the
new change and checks if it's qualified to be merged into a target branch. This
pipeline should contain only necessary jobs for checking the new changes.
For example, unit tests, lint checks, and Review Apps are often used in this cycle.
For example, unit tests, lint checks, and
[
Review Apps
](
../review_apps/index.md
)
are often used in this cycle.
With pipelines for merge requests, you can design a specific pipeline structure
for merge requests. All you need to do is just adding
`only: [merge_requests]`
to
...
...
@@ -14,10 +15,10 @@ Every time, when developers create or update merge requests, a pipeline runs on
their new commits at every push to GitLab.
NOTE:
**Note**
:
If you use both this feature and
the
[
Merge When Pipeline Succeeds
](
../../user/project/merge_requests/merge_when_pipeline_succeeds.md
)
feature, pipelines for merge requests take precen
dence over the other regular pipelines.
If you use both this feature and
[
Merge When Pipeline Succeeds
](
../../user/project/merge_requests/merge_when_pipeline_succeeds.md
)
,
pipelines for merge requests take prece
dence over the other regular pipelines.
For example, consider
a GitLab CI/CD configuration in .gitlab-ci.yml as follows
:
For example, consider
the following
[
`.gitlab-ci.yml`
](
../yaml/README.md
)
:
```
yaml
build
:
...
...
@@ -39,20 +40,18 @@ deploy:
script
:
./deploy
```
After
a developer updated code in a merge request with whatever methods (e.g.
`git push`
),
GitLab detects that the code is updated and create
a new pipeline for the merge request.
After
the merge request is updated with new commits, GitLab detects that changes
have occurred and creates
a new pipeline for the merge request.
The pipeline fetches the latest code from the source branch and run tests against it.
In th
is
example, the pipeline contains only
`build`
and
`test`
jobs.
Since
`deploy`
job does no
t have the
`only: [merge_requests]`
rule,
In th
e above
example, the pipeline contains only
`build`
and
`test`
jobs.
Since
the
`deploy`
job doesn'
t have the
`only: [merge_requests]`
rule,
deployment jobs will not happen in the merge request.
Consider this pipeline list viewed from the
**Pipelines**
tab in a merge request:
Pipelines tagged as
**merge request**
indicate that they were triggered
when a merge request was created or updated.
![
Merge request page
](
img/merge_request.png
)
Note that pipelines tagged as
**merge request**
indicate that they were triggered
when a merge request was created or updated.
The same tag is shown on the pipeline's details:
![
Pipeline's details
](
img/pipeline_detail.png
)
...
...
@@ -66,7 +65,7 @@ flow, external contributors follow the following steps:
1.
Create a merge request from the forked project that targets the
`master`
branch
in the parent project.
1.
A pipeline runs on the merge request.
1.
A main
at
iner from the parent project checks the pipeline result, and merge
1.
A main
ta
iner from the parent project checks the pipeline result, and merge
into a target branch if the latest pipeline has passed.
Currently, those pipelines are created in a
**forked**
project, not in the
...
...
@@ -77,7 +76,7 @@ by tweaking their GitLab Runner in the forked project.
There are multiple reasons about why GitLab doesn't allow those pipelines to be
created in the parent project, but one of the biggest reasons is security concern.
External users could steal secret variables from the parent project by modifying
.gitlab-ci.yml
, which could be some sort of credentials. This should not happen.
`.gitlab-ci.yml`
, which could be some sort of credentials. This should not happen.
We're discussing a secure solution of running pipelines for merge requests
that submitted from forked projects,
...
...
doc/ssh/README.md
View file @
66518762
...
...
@@ -185,7 +185,26 @@ your terminal (replacing `gitlab.com` with your GitLab's instance domain):
ssh
-T
git@gitlab.com
```
You should receive a _Welcome to GitLab,
`@username`
!_ message.
The first time you connect to GitLab via SSH, you will be asked to verify the
authenticity of the GitLab host you are connecting to.
For example, when connecting to GitLab.com, answer
`yes`
to add GitLab.com to
the list of trusted hosts:
```
The authenticity of host 'gitlab.com (35.231.145.151)' can't be established.
ECDSA key fingerprint is SHA256:HbW3g8zUjNSksFbqTiUWPWg2Bq1x8xdGUrliXFzSnUw.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'gitlab.com' (ECDSA) to the list of known hosts.
```
NOTE:
**Note:**
For GitLab.com, consult the
[
SSH host keys fingerprints
](
../user/gitlab_com/index.md#ssh-host-keys-fingerprints
)
,
to make sure you're connecting to the correct server.
Once added to the list of known hosts, you won't be asked to validate the
authenticity of GitLab's host again. Run the above command once more, and
you should only receive a _Welcome to GitLab,
`@username`
!_ message.
If the welcome message doesn't appear, run SSH's verbose mode by replacing
`-T`
with
`-vvvT`
to understand where the error is.
...
...
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