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
5145de2d
Commit
5145de2d
authored
Feb 20, 2020
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-branch-sync' into 'master'
Fix branch sync See merge request gitlab-org/gitlab!25596
parents
f1929274
30ebe047
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
.gitlab/CODEOWNERS
.gitlab/CODEOWNERS
+3
-0
.gitlab/ci/rules.gitlab-ci.yml
.gitlab/ci/rules.gitlab-ci.yml
+2
-2
No files found.
.gitlab/CODEOWNERS
View file @
5145de2d
...
...
@@ -43,3 +43,6 @@ Dangerfile @gl-quality/eng-prod
/danger/ @gl-quality/eng-prod
/lib/gitlab/danger/ @gl-quality/eng-prod
/scripts/ @gl-quality/eng-prod
# Delivery owner files
/.gitlab/ci/releases.gitlab-ci.yml @gitlab-org/delivery
.gitlab/ci/rules.gitlab-ci.yml
View file @
5145de2d
...
...
@@ -371,11 +371,11 @@
##################
.releases:rules:canonical-dot-com-gitlab-stable-branch-only:
rules
:
-
if
:
'
$CI_SERVER_HOST
==
"gitlab.com"
&&
$CI_PROJECT_
NAME
==
"gitlab-org/gitlab"
&&
$CI_COMMIT_REF_NAME
=~
/^[\d-]+-stable-ee$/'
-
if
:
'
$CI_SERVER_HOST
==
"gitlab.com"
&&
$CI_PROJECT_
PATH
==
"gitlab-org/gitlab"
&&
$CI_COMMIT_REF_NAME
=~
/^[\d-]+-stable-ee$/'
.releases:rules:canonical-dot-com-security-gitlab-stable-branch-only:
rules
:
-
if
:
'
$CI_SERVER_HOST
==
"gitlab.com"
&&
$CI_PROJECT_
NAME
==
"gitlab-org/security/gitlab"
&&
$CI_COMMIT_REF_NAME
=~
/^[\d-]+-stable-ee$/'
-
if
:
'
$CI_SERVER_HOST
==
"gitlab.com"
&&
$CI_PROJECT_
PATH
==
"gitlab-org/security/gitlab"
&&
$CI_COMMIT_REF_NAME
=~
/^[\d-]+-stable-ee$/'
#################
# Reports rules #
...
...
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