Automatic merge of gitlab-org/gitlab-ce master

app/models/project_services/teamcity_service.rb

@@ -39,9 +39,7 @@ class TeamcityService < CiService
   end
 
   def help
-    'The build configuration in Teamcity must use the build format '\
-    'number %build.vcs.number% '\
-    'you will also want to configure monitoring of all branches so merge '\
+    'You will want to configure monitoring of all branches so merge '\
     'requests build, that setting is in the vsc root advanced settings.'
   end
 
@@ -70,7 +68,7 @@ class TeamcityService < CiService
   end
 
   def calculate_reactive_cache(sha, ref)
-    response = get_path("httpAuth/app/rest/builds/branch:unspecified:any,number:#{sha}")
+    response = get_path("httpAuth/app/rest/builds/branch:unspecified:any,revision:#{sha}")
 
     { build_page: read_build_page(response), commit_status: read_commit_status(response) }
   end

changelogs/unreleased/55495-teamcity-use-revision-in-query.yml

+---
+title: Build number does not need to be tweaked anymore for the TeamCity integration to work properly.
+merge_request: 23898
+author:
+type: changed

changelogs/unreleased/tc-remove-20181218192239-migration.yml

+---
+title: Remove migration to backfill project_repositories for legacy storage projects
+merge_request: 24299
+author:
+type: removed

db/post_migrate/20181218192239_backfill_project_repositories_for_legacy_storage_projects.rb

-# frozen_string_literal: true
-
-class BackfillProjectRepositoriesForLegacyStorageProjects < ActiveRecord::Migration[5.0]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME       = false
-  BATCH_SIZE     = 1_000
-  DELAY_INTERVAL = 5.minutes
-  MIGRATION      = 'BackfillLegacyProjectRepositories'
-
-  disable_ddl_transaction!
-
-  class Project < ActiveRecord::Base
-    include EachBatch
-
-    self.table_name = 'projects'
-  end
-
-  def up
-    queue_background_migration_jobs_by_range_at_intervals(Project, MIGRATION, DELAY_INTERVAL)
-  end
-
-  def down
-    # no-op: since there could have been existing rows before the migration do not remove anything
-  end
-end

spec/lib/gitlab/background_migration/backfill_legacy_project_repositories_spec.rb

@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::BackfillLegacyProjectRepositories, :migration, schema: 20181218192239 do
+describe Gitlab::BackgroundMigration::BackfillLegacyProjectRepositories, :migration, schema: 20181212171634 do
   it_behaves_like 'backfill migration for project repositories', :legacy
 end

spec/models/project_services/teamcity_service_spec.rb

@@ -205,7 +205,7 @@ describe TeamcityService, :use_clean_rails_memory_store_caching do
   end
 
   def stub_request(status: 200, body: nil, build_status: 'success')
-    teamcity_full_url = 'http://gitlab.com/teamcity/httpAuth/app/rest/builds/branch:unspecified:any,number:123'
+    teamcity_full_url = 'http://gitlab.com/teamcity/httpAuth/app/rest/builds/branch:unspecified:any,revision:123'
     auth = %w(mic password)
 
     body ||= %Q({"build":{"status":"#{build_status}","id":"666"}})