Resolve .gitlab-ci.yml via 7e56ff3c

.gitlab-ci.yml

@@ -238,6 +238,7 @@ stages:
   <<: *dedicated-no-docs-pull-cache-job
   <<: *use-pg
   variables:
+    SETUP_DB: "false"
     CREATE_DB_USER: "true"
   script:
     # Manually clone gitlab-test and only seed this project in
@@ -284,7 +285,7 @@ stages:
   variables:
     CREATE_DB_USER: "true"
   script:
-    - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0
+    - git fetch https://gitlab.com/gitlab-org/gitlab-ee.git v9.3.0-ee
     - git checkout -f FETCH_HEAD
     - bundle install $BUNDLE_INSTALL_FLAGS
     - date
@@ -600,28 +601,6 @@ db:check-schema-pg:
   script:
     - source scripts/schema_changed.sh
 
-<<<<<<< HEAD
-.migration-paths: &migration-paths
-  <<: *dedicated-runner
-  <<: *except-docs-and-qa
-  <<: *pull-cache
-  stage: test
-  variables:
-    SETUP_DB: "false"
-    CREATE_DB_USER: "true"
-  script:
-    - git fetch https://gitlab.com/gitlab-org/gitlab-ee.git v9.3.0-ee
-    - git checkout -f FETCH_HEAD
-    - bundle install $BUNDLE_INSTALL_FLAGS
-    - cp config/gitlab.yml.example config/gitlab.yml
-    - bundle exec rake db:drop db:create db:schema:load db:seed_fu
-    - git checkout $CI_COMMIT_SHA
-    - bundle install $BUNDLE_INSTALL_FLAGS
-    - . scripts/prepare_build.sh
-    - bundle exec rake db:migrate
-
-=======
->>>>>>> upstream/master
 migration:path-pg:
   <<: *migration-paths
   <<: *use-pg