Skip to content

G
gitlab-ce
Commit 2525f751 authored by Albert Salim's avatar Albert Salim
Browse files
Options

Remove redundant `exists-ee`

parent 334eb118
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 26 deletions
.gitlab/ci/rules.gitlab-ci.yml
View file @ 2525f751
...@@ -444,9 +444,6 @@ ...@@ -444,9 +444,6 @@
.frontend:rules:eslint-as-if-foss: .frontend:rules:eslint-as-if-foss:
rules: rules:
- <<: *if-merge-request-title-as-if-foss
<<: *exists-ee
when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee <<: *exists-ee
changes: *frontend-patterns changes: *frontend-patterns
...@@ -660,13 +657,10 @@ ...@@ -660,13 +657,10 @@
.rails:rules:ee-only-migration:minimal: .rails:rules:ee-only-migration:minimal:
rules: rules:
- <<: *if-merge-request-rspec-minimal-disabled - <<: *if-merge-request-rspec-minimal-disabled
<<: *exists-ee
when: never when: never
- <<: *if-merge-request-title-run-all-rspec - <<: *if-merge-request-title-run-all-rspec
<<: *exists-ee
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee
changes: *ci-patterns changes: *ci-patterns
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
...@@ -683,13 +677,10 @@ ...@@ -683,13 +677,10 @@
.rails:rules:ee-only-unit:minimal: .rails:rules:ee-only-unit:minimal:
rules: rules:
- <<: *if-merge-request-rspec-minimal-disabled - <<: *if-merge-request-rspec-minimal-disabled
<<: *exists-ee
when: never when: never
- <<: *if-merge-request-title-run-all-rspec - <<: *if-merge-request-title-run-all-rspec
<<: *exists-ee
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee
changes: *ci-patterns changes: *ci-patterns
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
...@@ -706,13 +697,10 @@ ...@@ -706,13 +697,10 @@
.rails:rules:ee-only-integration:minimal: .rails:rules:ee-only-integration:minimal:
rules: rules:
- <<: *if-merge-request-rspec-minimal-disabled - <<: *if-merge-request-rspec-minimal-disabled
<<: *exists-ee
when: never when: never
- <<: *if-merge-request-title-run-all-rspec - <<: *if-merge-request-title-run-all-rspec
<<: *exists-ee
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee
changes: *ci-patterns changes: *ci-patterns
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
...@@ -729,13 +717,10 @@ ...@@ -729,13 +717,10 @@
.rails:rules:ee-only-system:minimal: .rails:rules:ee-only-system:minimal:
rules: rules:
- <<: *if-merge-request-rspec-minimal-disabled - <<: *if-merge-request-rspec-minimal-disabled
<<: *exists-ee
when: never when: never
- <<: *if-merge-request-title-run-all-rspec - <<: *if-merge-request-title-run-all-rspec
<<: *exists-ee
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee
changes: *ci-patterns changes: *ci-patterns
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
...@@ -759,10 +744,8 @@ ...@@ -759,10 +744,8 @@
.rails:rules:as-if-foss-migration:minimal: .rails:rules:as-if-foss-migration:minimal:
rules: rules:
- <<: *if-merge-request-rspec-minimal-disabled - <<: *if-merge-request-rspec-minimal-disabled
<<: *exists-ee
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee
changes: *ci-patterns changes: *ci-patterns
when: never when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
...@@ -791,10 +774,8 @@ ...@@ -791,10 +774,8 @@
.rails:rules:as-if-foss-unit:minimal: .rails:rules:as-if-foss-unit:minimal:
rules: rules:
- <<: *if-merge-request-rspec-minimal-disabled - <<: *if-merge-request-rspec-minimal-disabled
<<: *exists-ee
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee
changes: *ci-patterns changes: *ci-patterns
when: never when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
...@@ -803,8 +784,6 @@ ...@@ -803,8 +784,6 @@
- <<: *if-merge-request-title-as-if-foss - <<: *if-merge-request-title-as-if-foss
<<: *exists-ee <<: *exists-ee
changes: *backend-patterns changes: *backend-patterns
- <<: *if-merge-request-title-run-all-rspec
<<: *exists-ee
.rails:rules:as-if-foss-integration: .rails:rules:as-if-foss-integration:
rules: rules:
...@@ -823,10 +802,8 @@ ...@@ -823,10 +802,8 @@
.rails:rules:as-if-foss-integration:minimal: .rails:rules:as-if-foss-integration:minimal:
rules: rules:
- <<: *if-merge-request-rspec-minimal-disabled - <<: *if-merge-request-rspec-minimal-disabled
<<: *exists-ee
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee
changes: *ci-patterns changes: *ci-patterns
when: never when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
...@@ -855,10 +832,8 @@ ...@@ -855,10 +832,8 @@
.rails:rules:as-if-foss-system:minimal: .rails:rules:as-if-foss-system:minimal:
rules: rules:
- <<: *if-merge-request-rspec-minimal-disabled - <<: *if-merge-request-rspec-minimal-disabled
<<: *exists-ee
when: never when: never
- <<: *if-merge-request - <<: *if-merge-request
<<: *exists-ee
changes: *ci-patterns changes: *ci-patterns
when: never when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
...@@ -896,7 +871,6 @@ ...@@ -896,7 +871,6 @@
.rails:rules:rspec-foss-impact: .rails:rules:rspec-foss-impact:
rules: rules:
- <<: *if-merge-request-title-as-if-foss - <<: *if-merge-request-title-as-if-foss
<<: *exists-ee
when: never when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
<<: *exists-ee <<: *exists-ee
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7