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
a8a36a36
Commit
a8a36a36
authored
Apr 29, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
c4ba1186
ab9910f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
doc/development/documentation/styleguide.md
doc/development/documentation/styleguide.md
+10
-3
doc/development/testing_guide/end_to_end_tests.md
doc/development/testing_guide/end_to_end_tests.md
+2
-3
No files found.
doc/development/documentation/styleguide.md
View file @
a8a36a36
...
@@ -362,16 +362,23 @@ For other punctuation rules, please refer to the
...
@@ -362,16 +362,23 @@ For other punctuation rules, please refer to the
E.g., instead of writing something like `Read more about GitLab Issue Boards [here](LINK)`,
E.g., instead of writing something like `Read more about GitLab Issue Boards [here](LINK)`,
write `Read more about [GitLab Issue Boards](LINK)`.
write `Read more about [GitLab Issue Boards](LINK)`.
### Links
to confidential issue
s
### Links
requiring permission
s
Don't link directly to [confidential issues](../../user/project/issues/confidential_issues.md). These will fail for:
Don't link directly to:
- [Confidential issues](../../user/project/issues/confidential_issues.md).
- Project features that require [special permissions](../../user/permissions.md) to view.
These will fail for:
- Those without sufficient permissions.
- Those without sufficient permissions.
- Automated link checkers.
- Automated link checkers.
Instead:
Instead:
- Mention in the text that the information is contained in a confidential issue. This will reduce confusion.
- To reduce confusion, mention in the text that the information is either:
- Contained in a confidential issue.
- Requires special permission to a project to view.
- Provide a link in back ticks (`` ` ``) so that those with access to the issue can easily navigate to it.
- Provide a link in back ticks (`` ` ``) so that those with access to the issue can easily navigate to it.
Example:
Example:
...
...
doc/development/testing_guide/end_to_end_tests.md
View file @
a8a36a36
...
@@ -99,13 +99,13 @@ subgraph gitlab-qa pipeline
...
@@ -99,13 +99,13 @@ subgraph gitlab-qa pipeline
1.
When packages are ready, and available in the registry, a final step in the
1.
When packages are ready, and available in the registry, a final step in the
[
Omnibus GitLab
][
omnibus-gitlab
]
pipeline, triggers a new
[
Omnibus GitLab
][
omnibus-gitlab
]
pipeline, triggers a new
[
GitLab QA pipeline
][
gitlab-qa-pipelines
]
. It also waits for a resulting status.
GitLab QA pipeline (those with access can view them at
`https://gitlab.com/gitlab-org/gitlab-qa/pipelines`
)
. It also waits for a resulting status.
1.
GitLab QA pulls images from the registry, spins-up containers and runs tests
1.
GitLab QA pulls images from the registry, spins-up containers and runs tests
against a test environment that has been just orchestrated by the
`gitlab-qa`
against a test environment that has been just orchestrated by the
`gitlab-qa`
tool.
tool.
1.
The result of the
[
GitLab QA pipeline
][
gitlab-qa-pipelines
]
is being
1.
The result of the
GitLab QA pipeline
is being
propagated upstream, through Omnibus, back to the CE / EE merge request.
propagated upstream, through Omnibus, back to the CE / EE merge request.
#### Using the `review-qa-all` jobs
#### Using the `review-qa-all` jobs
...
@@ -146,7 +146,6 @@ you can find an issue you would like to work on in
...
@@ -146,7 +146,6 @@ you can find an issue you would like to work on in
[
omnibus-gitlab
]:
https://gitlab.com/gitlab-org/omnibus-gitlab
[
omnibus-gitlab
]:
https://gitlab.com/gitlab-org/omnibus-gitlab
[
gitlab-qa
]:
https://gitlab.com/gitlab-org/gitlab-qa
[
gitlab-qa
]:
https://gitlab.com/gitlab-org/gitlab-qa
[
gitlab-qa-pipelines
]:
https://gitlab.com/gitlab-org/gitlab-qa/pipelines
[
gitlab-qa-readme
]:
https://gitlab.com/gitlab-org/gitlab-qa/tree/master/README.md
[
gitlab-qa-readme
]:
https://gitlab.com/gitlab-org/gitlab-qa/tree/master/README.md
[
quality-nightly-pipelines
]:
https://gitlab.com/gitlab-org/quality/nightly/pipelines
[
quality-nightly-pipelines
]:
https://gitlab.com/gitlab-org/quality/nightly/pipelines
[
quality-staging-pipelines
]:
https://gitlab.com/gitlab-org/quality/staging/pipelines
[
quality-staging-pipelines
]:
https://gitlab.com/gitlab-org/quality/staging/pipelines
...
...
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