Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Wiki Replica
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
TPA
Wiki Replica
Commits
aaa7537c
Verified
Commit
aaa7537c
authored
2 months ago
by
anarcat
Browse files
Options
Downloads
Patches
Plain Diff
TPA-RFC-76: note that we can allow a deploy key to push (
team#41977
)
Found in
team#41977
parent
8e78f081
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#240439
passed with warnings
2 months ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
policy/tpa-rfc-76-puppet-merge-request-workflow.md
+6
-6
6 additions, 6 deletions
policy/tpa-rfc-76-puppet-merge-request-workflow.md
with
6 additions
and
6 deletions
policy/tpa-rfc-76-puppet-merge-request-workflow.md
+
6
−
6
View file @
aaa7537c
...
...
@@ -44,8 +44,8 @@ repository the GitLab server.
3.
Merge policy: "fast-forward only", to force developers to merge
locally and avoid accidentally trusting GitLab
4.
Branch rules: disallow anyone to merge
to the default branch, allow
maintainers to "push and merge"
4.
Branch rules: disallow anyone to
"
merge
" or "push and merge" to the
default branch, except a deploy key for the mirror
## Rationale
...
...
@@ -65,10 +65,10 @@ Each setting above brings us the following properties:
GitLab create a merge commit which then extends our attack surface
to GitLab
4.
Same as (3),
but more explicit. That way even if someone fancies
turning off the "fast-forward" flag by mistake, they will still
have to go through the complex branch rules settings and perhaps
th
ink twice about whether or not this is a good idea
.
4.
Same as (3),
another safeguard. This covers the case where someone
mistakenly pushes to the main branch. In this case, they are simply
not allowed to push at all. The mirror is updated with a deploy key
th
at lives on the Puppet server
.
# Alternatives
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment