Skip to content

G
gitlab-ce
Commit 5ca0b1a3 authored by Vitaliy @blackst0ne Klachkov's avatar Vitaliy @blackst0ne Klachkov
Browse files
Options

Fix conflicts in gitlab-ci.yml

parent d6035f5c
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
.gitlab-ci.yml
View file @ 5ca0b1a3
...@@ -83,7 +83,6 @@ stages: ...@@ -83,7 +83,6 @@ stages:
- mysql:latest - mysql:latest
- redis:alpine - redis:alpine
<<<<<<< HEAD
# BEGIN EE-only service helpers # BEGIN EE-only service helpers
.use-pg-9-6: &use-pg-9-6 .use-pg-9-6: &use-pg-9-6
...@@ -104,8 +103,6 @@ stages: ...@@ -104,8 +103,6 @@ stages:
- docker.elastic.co/elasticsearch/elasticsearch:5.5.2 - docker.elastic.co/elasticsearch/elasticsearch:5.5.2
# END EE-only service helpers # END EE-only service helpers
=======
>>>>>>> upstream/master
.rails5-variables: &rails5-variables .rails5-variables: &rails5-variables
script: script:
- export RAILS5=${RAILS5} - export RAILS5=${RAILS5}
...@@ -202,7 +199,6 @@ stages: ...@@ -202,7 +199,6 @@ stages:
<<: *rspec-metadata-mysql <<: *rspec-metadata-mysql
<<: *rails5 <<: *rails5
<<<<<<< HEAD
.rspec-metadata-ee: &rspec-metadata-ee .rspec-metadata-ee: &rspec-metadata-ee
<<: *rspec-metadata <<: *rspec-metadata
stage: test stage: test
...@@ -246,8 +242,6 @@ stages: ...@@ -246,8 +242,6 @@ stages:
<<: *rspec-metadata-pg-geo <<: *rspec-metadata-pg-geo
<<: *rails5 <<: *rails5
=======
>>>>>>> upstream/master
.spinach-metadata: &spinach-metadata .spinach-metadata: &spinach-metadata
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs-and-qa <<: *except-docs-and-qa
......
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