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
bafceab8
Commit
bafceab8
authored
Sep 03, 2020
by
Jonston Chan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add backticks around "master" in "master branch"
parent
ba2f6dbc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
doc/ci/environments/deployment_safety.md
doc/ci/environments/deployment_safety.md
+2
-2
doc/development/contributing/merge_request_workflow.md
doc/development/contributing/merge_request_workflow.md
+1
-1
No files found.
doc/ci/environments/deployment_safety.md
View file @
bafceab8
...
...
@@ -71,8 +71,8 @@ runs by enabling the [Skip outdated deployment jobs](../pipelines/settings.md#sk
Example of a problematic pipeline flow
**before**
enabling Skip outdated deployment jobs:
1.
Pipeline-A is created on the
master
branch.
1.
Later, Pipeline-B is created on the
master
branch (with a newer commit SHA).
1.
Pipeline-A is created on the
`master`
branch.
1.
Later, Pipeline-B is created on the
`master`
branch (with a newer commit SHA).
1.
The
`deploy`
job in Pipeline-B finishes first, and deploys the newer code.
1.
The
`deploy`
job in Pipeline-A finished later, and deploys the older code,
**overwriting**
the newer (latest) deployment.
...
...
doc/development/contributing/merge_request_workflow.md
View file @
bafceab8
...
...
@@ -176,7 +176,7 @@ the contribution acceptance criteria below:
exposing a bug in existing code). Every new class should have corresponding
unit tests, even if the class is exercised at a higher level, such as a feature test.
-
If a failing CI build seems to be unrelated to your contribution, you can try
restarting the failing CI job, rebasing from
master
to bring in updates that
restarting the failing CI job, rebasing from
`master`
to bring in updates that
may resolve the failure, or if it has not been fixed yet, ask a developer to
help you fix the test.
1.
The MR initially contains a few logically organized commits.
...
...
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