Rename project pipelines to ci_pipelines also added all_pipelines.

We user pipelines for different purposes not just CI, for example
chatops or the web ide. The problem is that all these pipelines
are displayed in merge requests, commits, and they're not as
important as the CI are. For example, if we commit something to an MR,
and then we open a web ide terminal in that MR, what we expect to see
in the MR page is the CI pipeline status of the commit, not the web ide
terminal one.

This commit split the project's :pipelines relationship into two:

- all_pipelines: which shows all project pipelines, no matter the type,
source or config_source
- ci_pipelines: which only shows those pipelines whose config_source is
 :repository_source, :auto_devops_source, or :unknown_source

This commit also modifies a little bit the behavior of the import/export.
Because we can't just bump the version of the backup files, we need to do it
in a couple of releases. In this MR, we allow exported files with both
ci_pipelines and pipelines as relationships. The resulted exported file
we'll have both relationships to allow backward compatibility.

42 files changed, 238 insertions, 70 deletions

diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 95a014d24da..a6bfb913900 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -22,7 +22,7 @@ class Projects::BranchesController < Projects::ApplicationController
         # Fetch branches for the specified mode
         fetch_branches_by_mode
 
-        @refs_pipelines = @project.pipelines.latest_successful_for_refs(@branches.map(&:name))
+        @refs_pipelines = @project.ci_pipelines.latest_successful_for_refs(@branches.map(&:name))
         @merged_branch_names = repository.merged_branch_names(@branches.map(&:name))
 
         # n+1: https://gitlab.com/gitlab-org/gitaly/issues/992
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 53b29d4146e..67827b1d3bb 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -46,7 +46,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def new
-    @pipeline = project.pipelines.new(ref: @project.default_branch)
+    @pipeline = project.all_pipelines.new(ref: @project.default_branch)
   end
 
   def create
@@ -142,9 +142,9 @@ class Projects::PipelinesController < Projects::ApplicationController
     @charts[:pipeline_times] = Gitlab::Ci::Charts::PipelineTime.new(project)
 
     @counts = {}
-    @counts[:total] = @project.pipelines.count(:all)
-    @counts[:success] = @project.pipelines.success.count(:all)
-    @counts[:failed] = @project.pipelines.failed.count(:all)
+    @counts[:total] = @project.all_pipelines.count(:all)
+    @counts[:success] = @project.all_pipelines.success.count(:all)
+    @counts[:failed] = @project.all_pipelines.failed.count(:all)
   end
 
   private
@@ -164,7 +164,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   # rubocop: disable CodeReuse/ActiveRecord
   def pipeline
     @pipeline ||= project
-                    .pipelines
+                    .all_pipelines
                     .includes(user: :status)
                     .find_by!(id: params[:id])
                     .present(current_user: current_user)
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index c8442ff3592..6c0eaafda99 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -18,7 +18,7 @@ class Projects::TagsController < Projects::ApplicationController
     @tags = Kaminari.paginate_array(@tags).page(params[:page])
 
     tag_names = @tags.map(&:name)
-    @tags_pipelines = @project.pipelines.latest_successful_for_refs(tag_names)
+    @tags_pipelines = @project.ci_pipelines.latest_successful_for_refs(tag_names)
     @releases = project.releases.where(tag: tag_names)
 
     respond_to do |format|
diff --git a/app/finders/pipelines_finder.rb b/app/finders/pipelines_finder.rb
index 35d0e1acce5..f5aadc42ff0 100644
--- a/app/finders/pipelines_finder.rb
+++ b/app/finders/pipelines_finder.rb
@@ -8,7 +8,7 @@ class PipelinesFinder
   def initialize(project, current_user, params = {})
     @project = project
     @current_user = current_user
-    @pipelines = project.pipelines
+    @pipelines = project.all_pipelines
     @params = params
   end
 
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 9512ba42f67..d87eddb2ae2 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -12,13 +12,13 @@ module Ci
     include AtomicInternalId
     include EnumWithNil
 
-    belongs_to :project, inverse_of: :pipelines
+    belongs_to :project, inverse_of: :all_pipelines
     belongs_to :user
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
     has_internal_id :iid, scope: :project, presence: false, init: ->(s) do
-      s&.project&.pipelines&.maximum(:iid) || s&.project&.pipelines&.count
+      s&.project&.all_pipelines&.maximum(:iid) || s&.project&.all_pipelines&.count
     end
 
     has_many :stages, -> { order(position: :asc) }, inverse_of: :pipeline
@@ -168,6 +168,7 @@ module Ci
     end
 
     scope :internal, -> { where(source: internal_sources) }
+    scope :ci_sources, -> { where(config_source: ci_sources_values) }
 
     # Returns the pipelines in descending order (= newest first), optionally
     # limited to a number of references.
@@ -256,6 +257,10 @@ module Ci
       sources.reject { |source| source == "external" }.values
     end
 
+    def self.ci_sources_values
+      config_sources.values_at(:repository_source, :auto_devops_source, :unknown_source)
+    end
+
     def stages_count
       statuses.select(:stage).distinct.count
     end
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 546fcc54a15..2c89da88b9b 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -298,7 +298,7 @@ class Commit
   end
 
   def pipelines
-    project.pipelines.where(sha: sha)
+    project.ci_pipelines.where(sha: sha)
   end
 
   def last_pipeline
@@ -312,7 +312,7 @@ class Commit
   end
 
   def status_for_project(ref, pipeline_project)
-    pipeline_project.pipelines.latest_status_per_commit(id, ref)[id]
+    pipeline_project.ci_pipelines.latest_status_per_commit(id, ref)[id]
   end
 
   def set_status_for_ref(ref, status)
diff --git a/app/models/commit_collection.rb b/app/models/commit_collection.rb
index dd93af9df64..e349f0fe971 100644
--- a/app/models/commit_collection.rb
+++ b/app/models/commit_collection.rb
@@ -24,7 +24,7 @@ class CommitCollection
   # Setting this status ahead of time removes the need for running a query for
   # every commit we're displaying.
   def with_pipeline_status
-    statuses = project.pipelines.latest_status_per_commit(map(&:id), ref)
+    statuses = project.ci_pipelines.latest_status_per_commit(map(&:id), ref)
 
     each do |commit|
       commit.set_status_for_ref(ref, statuses[commit.id])
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 92add079a02..97e761be997 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1055,7 +1055,7 @@ class MergeRequest < ActiveRecord::Base
   def all_pipelines
     return Ci::Pipeline.none unless source_project
 
-    @all_pipelines ||= source_project.pipelines
+    @all_pipelines ||= source_project.ci_pipelines
       .where(sha: all_commit_shas, ref: source_branch)
       .order(id: :desc)
   end
@@ -1214,7 +1214,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def base_pipeline
-    @base_pipeline ||= project.pipelines
+    @base_pipeline ||= project.ci_pipelines
       .order(id: :desc)
       .find_by(sha: diff_base_sha)
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index 39978d8a4c4..f273b692123 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -237,7 +237,17 @@ class Project < ActiveRecord::Base
   has_many :container_repositories, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
 
   has_many :commit_statuses
-  has_many :pipelines, class_name: 'Ci::Pipeline', inverse_of: :project
+  # The relation :all_pipelines is intented to be used when we want to get the
+  # whole list of pipelines associated to the project
+  has_many :all_pipelines, class_name: 'Ci::Pipeline', inverse_of: :project
+  # The relation :ci_pipelines is intented to be used when we want to get only
+  # those pipeline which are directly related to CI. There are
+  # other pipelines, like webide ones, that we won't retrieve
+  # if we use this relation.
+  has_many :ci_pipelines,
+          -> { Feature.enabled?(:pipeline_ci_sources_only, default_enabled: true) ? Ci::Pipeline.ci_sources : all },
+          class_name: 'Ci::Pipeline',
+          inverse_of: :project
   has_many :stages, class_name: 'Ci::Stage', inverse_of: :project
 
   # Ci::Build objects store data on the file system such as artifact files and
@@ -610,7 +620,7 @@ class Project < ActiveRecord::Base
 
   # ref can't be HEAD, can only be branch/tag name or SHA
   def latest_successful_builds_for(ref = default_branch)
-    latest_pipeline = pipelines.latest_successful_for(ref)
+    latest_pipeline = ci_pipelines.latest_successful_for(ref)
 
     if latest_pipeline
       latest_pipeline.builds.latest.with_artifacts_archive
@@ -1469,7 +1479,7 @@ class Project < ActiveRecord::Base
 
     return unless sha
 
-    pipelines.order(id: :desc).find_by(sha: sha, ref: ref)
+    ci_pipelines.order(id: :desc).find_by(sha: sha, ref: ref)
   end
 
   def latest_successful_pipeline_for_default_branch
@@ -1478,12 +1488,12 @@ class Project < ActiveRecord::Base
     end
 
     @latest_successful_pipeline_for_default_branch =
-      pipelines.latest_successful_for(default_branch)
+      ci_pipelines.latest_successful_for(default_branch)
   end
 
   def latest_successful_pipeline_for(ref = nil)
     if ref && ref != default_branch
-      pipelines.latest_successful_for(ref)
+      ci_pipelines.latest_successful_for(ref)
     else
       latest_successful_pipeline_for_default_branch
     end
diff --git a/app/models/project_services/pipelines_email_service.rb b/app/models/project_services/pipelines_email_service.rb
index 6f39a5e6e83..d60a6a7efa3 100644
--- a/app/models/project_services/pipelines_email_service.rb
+++ b/app/models/project_services/pipelines_email_service.rb
@@ -38,11 +38,11 @@ class PipelinesEmailService < Service
   end
 
   def can_test?
-    project.pipelines.any?
+    project.ci_pipelines.any?
   end
 
   def test_data(project, user)
-    data = Gitlab::DataBuilder::Pipeline.build(project.pipelines.last)
+    data = Gitlab::DataBuilder::Pipeline.build(project.ci_pipelines.last)
     data[:user] = user.hook_attrs
     data
   end
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 92a8438ab2f..d3d35434197 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -67,7 +67,7 @@ module Ci
 
     # rubocop: disable CodeReuse/ActiveRecord
     def auto_cancelable_pipelines
-      project.pipelines
+      project.ci_pipelines
         .where(ref: pipeline.ref)
         .where.not(id: pipeline.id)
         .where.not(sha: project.commit(pipeline.ref).try(:id))
diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb
index 6081a7d1de0..8663e585df8 100644
--- a/app/services/merge_requests/create_service.rb
+++ b/app/services/merge_requests/create_service.rb
@@ -56,7 +56,7 @@ module MergeRequests
       sha = merge_request.source_branch_sha
       return unless sha
 
-      pipelines = merge_request.source_project.pipelines.where(ref: merge_request.source_branch, sha: sha)
+      pipelines = merge_request.source_project.ci_pipelines.where(ref: merge_request.source_branch, sha: sha)
 
       pipelines.order(id: :desc).first
     end
diff --git a/app/services/projects/auto_devops/disable_service.rb b/app/services/projects/auto_devops/disable_service.rb
index 1b578a3c5ce..6608b3da1a8 100644
--- a/app/services/projects/auto_devops/disable_service.rb
+++ b/app/services/projects/auto_devops/disable_service.rb
@@ -34,7 +34,7 @@ module Projects
       end
 
       def auto_devops_pipelines
-        @auto_devops_pipelines ||= project.pipelines.auto_devops_source
+        @auto_devops_pipelines ||= project.ci_pipelines.auto_devops_source
       end
     end
   end
diff --git a/app/services/test_hooks/project_service.rb b/app/services/test_hooks/project_service.rb
index 45e0e61e5c4..7e14ddcd017 100644
--- a/app/services/test_hooks/project_service.rb
+++ b/app/services/test_hooks/project_service.rb
@@ -49,7 +49,7 @@ module TestHooks
     end
 
     def pipeline_events_data
-      pipeline = project.pipelines.first
+      pipeline = project.ci_pipelines.first
       throw(:validation_error, 'Ensure the project has CI pipelines.') unless pipeline.present?
 
       Gitlab::DataBuilder::Pipeline.build(pipeline)
diff --git a/db/fixtures/development/14_pipelines.rb b/db/fixtures/development/14_pipelines.rb
index 5af77c49913..bdc0a2db7db 100644
--- a/db/fixtures/development/14_pipelines.rb
+++ b/db/fixtures/development/14_pipelines.rb
@@ -104,7 +104,7 @@ class Gitlab::Seeder::Pipelines
 
 
   def create_pipeline!(project, ref, commit)
-    project.pipelines.create!(sha: commit.id, ref: ref, source: :push)
+    project.ci_pipelines.create!(sha: commit.id, ref: ref, source: :push)
   end
 
   def build_create!(pipeline, opts = {})
diff --git a/db/migrate/20181127155638_add_pipelines_config_source_index.rb b/db/migrate/20181127155638_add_pipelines_config_source_index.rb
new file mode 100644
index 00000000000..d5b5f168772
--- /dev/null
+++ b/db/migrate/20181127155638_add_pipelines_config_source_index.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddPipelinesConfigSourceIndex < ActiveRecord::Migration[5.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :ci_pipelines, :config_source
+  end
+
+  def down
+    remove_concurrent_index :ci_pipelines, :config_source
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9c9c19aa897..a45c09fd9b4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181126153547) do
+ActiveRecord::Schema.define(version: 20181127155638) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -474,6 +474,7 @@ ActiveRecord::Schema.define(version: 20181126153547) do
     t.integer "failure_reason"
     t.integer "iid"
     t.index ["auto_canceled_by_id"], name: "index_ci_pipelines_on_auto_canceled_by_id", using: :btree
+    t.index ["config_source"], name: "index_ci_pipelines_on_config_source", using: :btree
     t.index ["pipeline_schedule_id"], name: "index_ci_pipelines_on_pipeline_schedule_id", using: :btree
     t.index ["project_id", "iid"], name: "index_ci_pipelines_on_project_id_and_iid", unique: true, where: "(iid IS NOT NULL)", using: :btree
     t.index ["project_id", "ref", "status", "id"], name: "index_ci_pipelines_on_project_id_and_ref_and_status_and_id", using: :btree
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 99553d993ca..d0338abea79 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -29,7 +29,7 @@ module API
 
         not_found!('Commit') unless user_project.commit(params[:sha])
 
-        pipelines = user_project.pipelines.where(sha: params[:sha])
+        pipelines = user_project.ci_pipelines.where(sha: params[:sha])
         statuses = ::CommitStatus.where(pipeline: pipelines)
         statuses = statuses.latest unless to_boolean(params[:all])
         statuses = statuses.where(ref: params[:ref]) if params[:ref].present?
@@ -75,7 +75,7 @@ module API
 
         pipeline = @project.pipeline_for(ref, commit.sha)
         unless pipeline
-          pipeline = @project.pipelines.create!(
+          pipeline = @project.ci_pipelines.create!(
             source: :external,
             sha: commit.sha,
             ref: ref,
diff --git a/lib/api/jobs.rb b/lib/api/jobs.rb
index 697555c9605..034aa5e0be3 100644
--- a/lib/api/jobs.rb
+++ b/lib/api/jobs.rb
@@ -56,7 +56,7 @@ module API
       end
       # rubocop: disable CodeReuse/ActiveRecord
       get ':id/pipelines/:pipeline_id/jobs' do
-        pipeline = user_project.pipelines.find(params[:pipeline_id])
+        pipeline = user_project.ci_pipelines.find(params[:pipeline_id])
         builds = pipeline.builds
         builds = filter_builds(builds, params[:scope])
         builds = builds.preload(:job_artifacts_archive, :job_artifacts, project: [:namespace])
diff --git a/lib/api/pipelines.rb b/lib/api/pipelines.rb
index cba1e3a6684..8b1de8aff94 100644
--- a/lib/api/pipelines.rb
+++ b/lib/api/pipelines.rb
@@ -130,7 +130,7 @@ module API
 
     helpers do
       def pipeline
-        @pipeline ||= user_project.pipelines.find(params[:pipeline_id])
+        @pipeline ||= user_project.ci_pipelines.find(params[:pipeline_id])
       end
     end
   end
diff --git a/lib/gitlab/badge/coverage/report.rb b/lib/gitlab/badge/coverage/report.rb
index a7fcb6b0fca..7f7cc62c8ef 100644
--- a/lib/gitlab/badge/coverage/report.rb
+++ b/lib/gitlab/badge/coverage/report.rb
@@ -14,7 +14,7 @@ module Gitlab
           @ref = ref
           @job = job
 
-          @pipeline = @project.pipelines.latest_successful_for(@ref)
+          @pipeline = @project.ci_pipelines.latest_successful_for(@ref)
         end
 
         def entity
diff --git a/lib/gitlab/badge/pipeline/status.rb b/lib/gitlab/badge/pipeline/status.rb
index 37e61f07e5b..a403d839517 100644
--- a/lib/gitlab/badge/pipeline/status.rb
+++ b/lib/gitlab/badge/pipeline/status.rb
@@ -22,7 +22,7 @@ module Gitlab
 
         # rubocop: disable CodeReuse/ActiveRecord
         def status
-          @project.pipelines
+          @project.ci_pipelines
             .where(sha: @sha)
             .latest_status(@ref) || 'unknown'
         end
diff --git a/lib/gitlab/ci/charts.rb b/lib/gitlab/ci/charts.rb
index a4f01468e8e..7cabaadb122 100644
--- a/lib/gitlab/ci/charts.rb
+++ b/lib/gitlab/ci/charts.rb
@@ -54,7 +54,7 @@ module Gitlab
 
         # rubocop: disable CodeReuse/ActiveRecord
         def collect
-          query = project.pipelines
+          query = project.all_pipelines
             .where("? > #{::Ci::Pipeline.table_name}.created_at AND #{::Ci::Pipeline.table_name}.created_at > ?", @to, @from) # rubocop:disable GitlabSecurity/SqlInjection
 
           totals_count  = grouped_count(query)
@@ -115,7 +115,7 @@ module Gitlab
 
       class PipelineTime < Chart
         def collect
-          commits = project.pipelines.last(30)
+          commits = project.all_pipelines.last(30)
 
           commits.each do |commit|
             @labels << commit.short_sha
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index b40eac3de9a..07969d1c014 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -51,7 +51,7 @@ project_tree:
     - resource_label_events:
       - label:
           :priorities
-  - pipelines:
+  - ci_pipelines:
     - notes:
       - :author
       - events:
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb
index 8cd4efd91cc..56ab474f729 100644
--- a/lib/gitlab/import_export/project_tree_restorer.rb
+++ b/lib/gitlab/import_export/project_tree_restorer.rb
@@ -26,6 +26,8 @@ module Gitlab
 
         @project_members = @tree_hash.delete('project_members')
 
+        RelationRenameFactory.rename(@tree_hash)
+
         ActiveRecord::Base.uncached do
           ActiveRecord::Base.no_touching do
             create_relations
@@ -214,7 +216,7 @@ module Gitlab
       end
 
       def nil_iid_pipeline?(relation_key, relation_item)
-        relation_key == 'pipelines' && relation_item['iid'].nil?
+        relation_key == 'ci_pipelines' && relation_item['iid'].nil?
       end
     end
   end
diff --git a/lib/gitlab/import_export/project_tree_saver.rb b/lib/gitlab/import_export/project_tree_saver.rb
index 29f2dc80813..d951590a2e2 100644
--- a/lib/gitlab/import_export/project_tree_saver.rb
+++ b/lib/gitlab/import_export/project_tree_saver.rb
@@ -34,6 +34,8 @@ module Gitlab
 
         project_json['project_members'] += group_members_json
 
+        RelationRenameFactory.add_renames(project_json)
+
         project_json.to_json
       end
 
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 097c7653754..a53fde6ffc5 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -4,6 +4,7 @@ module Gitlab
   module ImportExport
     class RelationFactory
       OVERRIDES = { snippets: :project_snippets,
+                    ci_pipelines: 'Ci::Pipeline',
                     pipelines: 'Ci::Pipeline',
                     stages: 'Ci::Stage',
                     statuses: 'commit_status',
diff --git a/lib/gitlab/import_export/relation_rename_factory.rb b/lib/gitlab/import_export/relation_rename_factory.rb
new file mode 100644
index 00000000000..e9bb9cac729
--- /dev/null
+++ b/lib/gitlab/import_export/relation_rename_factory.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    class RelationRenameFactory
+      RENAMES = { 'pipelines' => 'ci_pipelines' }.freeze
+
+      def self.rename(tree_hash)
+        return if tree_hash&.empty?
+
+        RENAMES.each do |old_name, new_name|
+          old_entry = tree_hash.delete(old_name)
+
+          next if tree_hash[new_name] || !old_entry
+
+          tree_hash[new_name] = old_entry
+        end
+      end
+
+      def self.add_renames(tree_hash)
+        RENAMES.each do |old_name, new_name|
+          next if tree_hash.key?(old_name)
+
+          tree_hash[old_name] = tree_hash[new_name]
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/commit/builds_spec.rb b/spec/features/projects/commit/builds_spec.rb
index bd254caddfb..caf69796d52 100644
--- a/spec/features/projects/commit/builds_spec.rb
+++ b/spec/features/projects/commit/builds_spec.rb
@@ -20,7 +20,7 @@ describe 'project commit pipelines', :js do
       visit pipelines_project_commit_path(project, project.commit.sha)
 
       page.within('.table-holder') do
-        expect(page).to have_content project.pipelines[0].id     # pipeline ids
+        expect(page).to have_content project.ci_pipelines[0].id     # pipeline ids
       end
     end
   end
diff --git a/spec/features/projects/pages_spec.rb b/spec/features/projects/pages_spec.rb
index 831f22a0e69..435fb229b69 100644
--- a/spec/features/projects/pages_spec.rb
+++ b/spec/features/projects/pages_spec.rb
@@ -300,7 +300,7 @@ describe 'Pages' do
         let(:pipeline) do
           commit_sha = project.commit('HEAD').sha
 
-          project.pipelines.create(
+          project.ci_pipelines.create(
             ref: 'HEAD',
             sha: commit_sha,
             source: :push,
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 1d184375a52..20e668a8ee9 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -102,7 +102,7 @@ merge_request_diff_commits:
 - merge_request_diff
 merge_request_diff_files:
 - merge_request_diff
-pipelines:
+ci_pipelines:
 - project
 - user
 - stages
@@ -260,7 +260,8 @@ project:
 - notification_settings
 - import_data
 - commit_statuses
-- pipelines
+- ci_pipelines
+- all_pipelines
 - stages
 - builds
 - runner_projects
diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
index 7171e12a849..242c16c4bdc 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -197,9 +197,9 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
         end
 
         it 'has the correct number of pipelines and statuses' do
-          expect(@project.pipelines.size).to eq(5)
+          expect(@project.ci_pipelines.size).to eq(5)
 
-          @project.pipelines.zip([2, 2, 2, 2, 2])
+          @project.ci_pipelines.zip([2, 2, 2, 2, 2])
             .each do |(pipeline, expected_status_size)|
             expect(pipeline.statuses.size).to eq(expected_status_size)
           end
diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
index 5dc372263ad..46fdfba953b 100644
--- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
@@ -119,16 +119,16 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
       end
 
       it 'has pipeline stages' do
-        expect(saved_project_json.dig('pipelines', 0, 'stages')).not_to be_empty
+        expect(saved_project_json.dig('ci_pipelines', 0, 'stages')).not_to be_empty
       end
 
       it 'has pipeline statuses' do
-        expect(saved_project_json.dig('pipelines', 0, 'stages', 0, 'statuses')).not_to be_empty
+        expect(saved_project_json.dig('ci_pipelines', 0, 'stages', 0, 'statuses')).not_to be_empty
       end
 
       it 'has pipeline builds' do
         builds_count = saved_project_json
-          .dig('pipelines', 0, 'stages', 0, 'statuses')
+          .dig('ci_pipelines', 0, 'stages', 0, 'statuses')
           .count { |hash| hash['type'] == 'Ci::Build' }
 
         expect(builds_count).to eq(1)
@@ -142,11 +142,11 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
       end
 
       it 'has pipeline commits' do
-        expect(saved_project_json['pipelines']).not_to be_empty
+        expect(saved_project_json['ci_pipelines']).not_to be_empty
       end
 
       it 'has ci pipeline notes' do
-        expect(saved_project_json['pipelines'].first['notes']).not_to be_empty
+        expect(saved_project_json['ci_pipelines'].first['notes']).not_to be_empty
       end
 
       it 'has labels with no associations' do
diff --git a/spec/lib/gitlab/import_export/relation_rename_factory_spec.rb b/spec/lib/gitlab/import_export/relation_rename_factory_spec.rb
new file mode 100644
index 00000000000..3e7159042c8
--- /dev/null
+++ b/spec/lib/gitlab/import_export/relation_rename_factory_spec.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::ImportExport::RelationRenameFactory do
+  let(:renames) do
+    {
+      'example_relation1' => 'new_example_relation1',
+      'example_relation2' => 'new_example_relation2'
+    }
+  end
+
+  let(:user) { create(:admin) }
+  let(:group) { create(:group, :nested) }
+  let!(:project) { create(:project, :builds_disabled, :issues_disabled, name: 'project', path: 'project') }
+  let(:shared) { project.import_export_shared }
+
+  before do
+    stub_const("#{described_class}::RENAMES", renames)
+  end
+
+  context 'when importing' do
+    let(:project_tree_restorer) { Gitlab::ImportExport::ProjectTreeRestorer.new(user: user, shared: shared, project: project) }
+    let(:import_path) { 'spec/lib/gitlab/import_export' }
+    let(:file_content) { IO.read("#{import_path}/project.json") }
+    let!(:json_file) { ActiveSupport::JSON.decode(file_content) }
+    let(:tree_hash) { project_tree_restorer.instance_variable_get(:@tree_hash) }
+
+    before do
+      allow(shared).to receive(:export_path).and_return(import_path)
+      allow(ActiveSupport::JSON).to receive(:decode).with(file_content).and_return(json_file)
+    end
+
+    context 'when the file has only old relationship names' do
+      before do
+        renames.each do |k, v|
+          json_file[k.to_s] = []
+        end
+      end
+
+      it 'renames old relationships to the new name' do
+        expect(json_file.keys).to include(*renames.keys)
+
+        project_tree_restorer.restore
+
+        expect(json_file.keys).to include(*renames.values)
+        expect(json_file.keys).not_to include(*renames.keys)
+      end
+    end
+
+    context 'when the file has both the old and new relationships' do
+      before do
+        renames.each do |k, v|
+          json_file[k.to_s] = [1]
+          json_file[v.to_s] = [2]
+        end
+      end
+
+      it 'uses the new relationships and removes the old ones from the hash' do
+        expect(json_file.keys).to include(*renames.keys)
+
+        project_tree_restorer.restore
+
+        expect(json_file.keys).to include(*renames.values)
+        expect(json_file.values_at(*renames.values).flatten.uniq.first).to eq 2
+        expect(json_file.keys).not_to include(*renames.keys)
+      end
+    end
+
+    context 'when the file has only new relationship names' do
+      before do
+        renames.each do |k, v|
+          json_file[v.to_s] = []
+        end
+      end
+
+      it 'uses the new relationships' do
+        expect(json_file.keys).not_to include(*renames.keys)
+
+        project_tree_restorer.restore
+
+        expect(json_file.keys).to include(*renames.values)
+      end
+    end
+  end
+
+  context 'when exporting' do
+    let(:project_tree_saver) { Gitlab::ImportExport::ProjectTreeSaver.new(project: project, current_user: user, shared: shared) }
+    let(:project_tree) { project_tree_saver.send(:project_json) }
+
+    it 'adds old relationships to the exported file' do
+      project_tree.merge!(renames.values.map { |v| [v, []] }.to_h)
+
+      saved_data = ActiveSupport::JSON.decode(project_tree_saver.send(:project_json_tree))
+
+      expect(saved_data.keys).to include(*(renames.keys + renames.values))
+    end
+  end
+end
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 9e6146b8a44..9244952d497 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -30,8 +30,9 @@ describe Ci::Pipeline, :mailer do
 
   describe 'associations' do
     it 'has a bidirectional relationship with projects' do
-      expect(described_class.reflect_on_association(:project).has_inverse?).to eq(:pipelines)
-      expect(Project.reflect_on_association(:pipelines).has_inverse?).to eq(:project)
+      expect(described_class.reflect_on_association(:project).has_inverse?).to eq(:all_pipelines)
+      expect(Project.reflect_on_association(:all_pipelines).has_inverse?).to eq(:project)
+      expect(Project.reflect_on_association(:ci_pipelines).has_inverse?).to eq(:project)
     end
   end
 
@@ -1003,7 +1004,7 @@ describe Ci::Pipeline, :mailer do
       create(:ci_build, :allowed_to_fail, :failed, pipeline: pipeline, name: 'rubocop')
       create(:ci_build, :allowed_to_fail, :failed, pipeline: pipeline2, name: 'rubocop')
 
-      pipelines = project.pipelines.to_a
+      pipelines = project.ci_pipelines.to_a
 
       pipelines.each(&:number_of_warnings)
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 47c331fbc7a..9ae24286819 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -60,7 +60,7 @@ describe Project do
     it { is_expected.to have_one(:forked_from_project).through(:fork_network_member) }
     it { is_expected.to have_one(:auto_devops).class_name('ProjectAutoDevops') }
     it { is_expected.to have_many(:commit_statuses) }
-    it { is_expected.to have_many(:pipelines) }
+    it { is_expected.to have_many(:ci_pipelines) }
     it { is_expected.to have_many(:builds) }
     it { is_expected.to have_many(:build_trace_section_names)}
     it { is_expected.to have_many(:runner_projects) }
@@ -3372,7 +3372,7 @@ describe Project do
 
     context 'with a ref that is not the default branch' do
       it 'returns the latest successful pipeline for the given ref' do
-        expect(project.pipelines).to receive(:latest_successful_for).with('foo')
+        expect(project.ci_pipelines).to receive(:latest_successful_for).with('foo')
 
         project.latest_successful_pipeline_for('foo')
       end
@@ -3400,7 +3400,7 @@ describe Project do
     it 'memoizes and returns the latest successful pipeline for the default branch' do
       pipeline = double(:pipeline)
 
-      expect(project.pipelines).to receive(:latest_successful_for)
+      expect(project.ci_pipelines).to receive(:latest_successful_for)
         .with(project.default_branch)
         .and_return(pipeline)
         .once
diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index cd43bec35df..a43304c9b83 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -16,8 +16,8 @@ describe API::CommitStatuses do
     let(:get_url) { "/projects/#{project.id}/repository/commits/#{sha}/statuses" }
 
     context 'ci commit exists' do
-      let!(:master) { project.pipelines.create(source: :push, sha: commit.id, ref: 'master', protected: false) }
-      let!(:develop) { project.pipelines.create(source: :push, sha: commit.id, ref: 'develop', protected: false) }
+      let!(:master) { project.ci_pipelines.create(source: :push, sha: commit.id, ref: 'master', protected: false) }
+      let!(:develop) { project.ci_pipelines.create(source: :push, sha: commit.id, ref: 'develop', protected: false) }
 
       context "reporter user" do
         let(:statuses_id) { json_response.map { |status| status['id'] } }
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 329d069ef3d..9e599c2175f 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -818,7 +818,7 @@ describe API::Commits do
       end
 
       context 'when the ref has a pipeline' do
-        let!(:pipeline) { project.pipelines.create(source: :push, ref: 'master', sha: commit.sha, protected: false) }
+        let!(:pipeline) { project.ci_pipelines.create(source: :push, ref: 'master', sha: commit.sha, protected: false) }
 
         it 'includes a "created" status' do
           get api(route, current_user)
diff --git a/spec/requests/api/pipelines_spec.rb b/spec/requests/api/pipelines_spec.rb
index 638cc9767d4..2e4fa0f9e16 100644
--- a/spec/requests/api/pipelines_spec.rb
+++ b/spec/requests/api/pipelines_spec.rb
@@ -304,7 +304,7 @@ describe API::Pipelines do
         it 'creates and returns a new pipeline' do
           expect do
             post api("/projects/#{project.id}/pipeline", user), ref: project.default_branch
-          end.to change { project.pipelines.count }.by(1)
+          end.to change { project.ci_pipelines.count }.by(1)
 
           expect(response).to have_gitlab_http_status(201)
           expect(json_response).to be_a Hash
@@ -317,8 +317,8 @@ describe API::Pipelines do
           it 'creates and returns a new pipeline using the given variables' do
             expect do
               post api("/projects/#{project.id}/pipeline", user), ref: project.default_branch, variables: variables
-            end.to change { project.pipelines.count }.by(1)
-            expect_variables(project.pipelines.last.variables, variables)
+            end.to change { project.ci_pipelines.count }.by(1)
+            expect_variables(project.ci_pipelines.last.variables, variables)
 
             expect(response).to have_gitlab_http_status(201)
             expect(json_response).to be_a Hash
@@ -338,8 +338,8 @@ describe API::Pipelines do
           it 'creates and returns a new pipeline using the given variables' do
             expect do
               post api("/projects/#{project.id}/pipeline", user), ref: project.default_branch, variables: variables
-            end.to change { project.pipelines.count }.by(1)
-            expect_variables(project.pipelines.last.variables, variables)
+            end.to change { project.ci_pipelines.count }.by(1)
+            expect_variables(project.ci_pipelines.last.variables, variables)
 
             expect(response).to have_gitlab_http_status(201)
             expect(json_response).to be_a Hash
@@ -353,7 +353,7 @@ describe API::Pipelines do
             it "doesn't create a job" do
               expect do
                 post api("/projects/#{project.id}/pipeline", user), ref: project.default_branch
-              end.not_to change { project.pipelines.count }
+              end.not_to change { project.ci_pipelines.count }
 
               expect(response).to have_gitlab_http_status(400)
             end
diff --git a/spec/requests/api/triggers_spec.rb b/spec/requests/api/triggers_spec.rb
index 0ae6796d1e4..658df6945d2 100644
--- a/spec/requests/api/triggers_spec.rb
+++ b/spec/requests/api/triggers_spec.rb
@@ -39,7 +39,7 @@ describe API::Triggers do
     end
 
     context 'Have a commit' do
-      let(:pipeline) { project.pipelines.last }
+      let(:pipeline) { project.ci_pipelines.last }
 
       it 'creates pipeline' do
         post api("/projects/#{project.id}/trigger/pipeline"), options.merge(ref: 'master')
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 4d9c5aabbda..3b51b69a1a7 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -43,7 +43,7 @@ describe Ci::CreatePipelineService do
         expect(pipeline).to be_valid
         expect(pipeline).to be_persisted
         expect(pipeline).to be_push
-        expect(pipeline).to eq(project.pipelines.last)
+        expect(pipeline).to eq(project.ci_pipelines.last)
         expect(pipeline).to have_attributes(user: user)
         expect(pipeline).to have_attributes(status: 'pending')
         expect(pipeline.repository_source?).to be true
diff --git a/spec/workers/pipeline_schedule_worker_spec.rb b/spec/workers/pipeline_schedule_worker_spec.rb
index a2fe4734d47..c5921eb8197 100644
--- a/spec/workers/pipeline_schedule_worker_spec.rb
+++ b/spec/workers/pipeline_schedule_worker_spec.rb
@@ -24,12 +24,12 @@ describe PipelineScheduleWorker do
     context 'when there is a scheduled pipeline within next_run_at' do
       shared_examples 'successful scheduling' do
         it 'creates a new pipeline' do
-          expect { subject }.to change { project.pipelines.count }.by(1)
+          expect { subject }.to change { project.ci_pipelines.count }.by(1)
           expect(Ci::Pipeline.last).to be_schedule
 
           pipeline_schedule.reload
           expect(pipeline_schedule.next_run_at).to be > Time.now
-          expect(pipeline_schedule).to eq(project.pipelines.last.pipeline_schedule)
+          expect(pipeline_schedule).to eq(project.ci_pipelines.last.pipeline_schedule)
           expect(pipeline_schedule).to be_active
         end
       end
@@ -53,7 +53,7 @@ describe PipelineScheduleWorker do
       end
 
       it 'does not creates a new pipeline' do
-        expect { subject }.not_to change { project.pipelines.count }
+        expect { subject }.not_to change { project.ci_pipelines.count }
       end
     end
   end
@@ -66,7 +66,7 @@ describe PipelineScheduleWorker do
     end
 
     it 'does not schedule a pipeline' do
-      expect { subject }.not_to change { project.pipelines.count }
+      expect { subject }.not_to change { project.ci_pipelines.count }
     end
   end
 end