Skip to content

G
gitlab-ce
Commit ce306cc9 authored by Steve Azzopardi's avatar Steve Azzopardi
Browse files
Options

Resolve conflicts in .gitlab-ci.yml 

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8472/
parent 51de62b8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
.gitlab-ci.yml
View file @ ce306cc9
...@@ -612,7 +612,6 @@ rspec-pg-rails4: ...@@ -612,7 +612,6 @@ rspec-pg-rails4:
rspec-mysql-rails4: rspec-mysql-rails4:
<<: *rspec-metadata-mysql-rails4 <<: *rspec-metadata-mysql-rails4
parallel: 30 parallel: 30
<<<<<<< HEAD
# EE jobs START # EE jobs START
rspec-pg-ee: rspec-pg-ee:
...@@ -637,8 +636,6 @@ rspec-mysql-ee-rails4: ...@@ -637,8 +636,6 @@ rspec-mysql-ee-rails4:
rspec-pg-geo-rails4: *rspec-metadata-pg-geo-9-6-rails4 rspec-pg-geo-rails4: *rspec-metadata-pg-geo-9-6-rails4
rspec-pg-10-geo-rails4: *rspec-metadata-pg-geo-10-2-rails4 rspec-pg-10-geo-rails4: *rspec-metadata-pg-geo-10-2-rails4
# EE jobs END # EE jobs END
=======
>>>>>>> upstream/master
static-analysis: static-analysis:
<<: *dedicated-no-docs-no-db-pull-cache-job <<: *dedicated-no-docs-no-db-pull-cache-job
......
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