Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/diffs/components/commit_item.vue

@@ -91,7 +91,7 @@ export default {
           <icon :size="12" name="ellipsis_h" />
         </button>
 
-        <div class="commiter">
+        <div class="committer">
           <a
             :href="authorUrl"
             :class="authorClass"

app/assets/stylesheets/pages/commits.scss

@@ -180,6 +180,14 @@
     display: flex;
     align-items: center;
   }
+
+  .committer {
+    color: $gl-text-color-tertiary;
+
+    .commit-author-link {
+      color: $gl-text-color;
+    }
+  }
 }
 
 .commit-actions {

app/models/project_ci_cd_setting.rb

@@ -31,6 +31,8 @@ class ProjectCiCdSetting < ApplicationRecord
   private
 
   def set_default_git_depth
+    return unless Feature.enabled?(:ci_set_project_default_git_depth, default_enabled: true)
+
     self.default_git_depth ||= DEFAULT_GIT_DEPTH
   end
 end

app/presenters/ci/build_runner_presenter.rb

@@ -27,7 +27,7 @@ module Ci
     def git_depth
       if git_depth_variable
         git_depth_variable[:value]
-      else
+      elsif Feature.enabled?(:ci_project_git_depth, default_enabled: true)
         project.default_git_depth
       end.to_i
     end

changelogs/unreleased/61072-link-to-user-profile-not-distinguishable-on-latest-commit-widget.yml

+---
+title: User link styling for commits
+merge_request: 29150
+author:
+type: other

changelogs/unreleased/osw-fix-post-dep-migration-with-timeout.yml

+---
+title: Avoid DB timeouts when scheduling migrations
+merge_request: 29437
+author:
+type: fixed

db/post_migrate/20190528180441_enqueue_reset_merge_status.rb

@@ -16,15 +16,10 @@ class EnqueueResetMergeStatus < ActiveRecord::Migration[5.1]
   def up
     say 'Scheduling `ResetMergeStatus` jobs'
 
-    # We currently have around 135_000 opened, mergeable MRs in GitLab.com. This iteration
-    # will schedule around 13 batches of 10_000 MRs, which should take around 1 hour to
-    # complete.
-    relation = MergeRequest.where(state: 'opened', merge_status: 'can_be_merged')
-
-    relation.each_batch(of: BATCH_SIZE) do |batch, index|
-      range = batch.pluck('MIN(id)', 'MAX(id)').first
-
-      BackgroundMigrationWorker.perform_in(index * DELAY_INTERVAL, MIGRATION, range)
-    end
+    # We currently have more than ~5_000_000 merge request records on GitLab.com.
+    # This means it'll schedule ~500 jobs (10k MRs each) with a 5 minutes gap,
+    # so this should take ~41 hours for all background migrations to complete.
+    # ((5_000_000 / 10_000) * 5) / 60 => 41.6666..
+    queue_background_migration_jobs_by_range_at_intervals(MergeRequest, MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE)
   end
 end

spec/javascripts/diffs/components/commit_item_spec.js

@@ -18,7 +18,7 @@ const getDescExpandElement = vm =>
   vm.$el.querySelector('.commit-content .text-expander.js-toggle-button');
 const getShaElement = vm => vm.$el.querySelector('.commit-sha-group');
 const getAvatarElement = vm => vm.$el.querySelector('.user-avatar-link');
-const getCommitterElement = vm => vm.$el.querySelector('.commiter');
+const getCommitterElement = vm => vm.$el.querySelector('.committer');
 const getCommitActionsElement = vm => vm.$el.querySelector('.commit-actions');
 
 describe('diffs/components/commit_item', () => {

spec/migrations/enqueue_reset_merge_status_spec.rb

@@ -40,9 +40,12 @@ describe EnqueueResetMergeStatus, :migration, :sidekiq do
           .to be_scheduled_delayed_migration(5.minutes, 1, 2)
 
         expect(described_class::MIGRATION)
-          .to be_scheduled_delayed_migration(10.minutes, 3, 3)
+          .to be_scheduled_delayed_migration(10.minutes, 3, 4)
 
-        expect(BackgroundMigrationWorker.jobs.size).to eq(2)
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(15.minutes, 5, 5)
+
+        expect(BackgroundMigrationWorker.jobs.size).to eq(3)
       end
     end
   end

spec/models/project_ci_cd_setting_spec.rb

@@ -48,5 +48,17 @@ describe ProjectCiCdSetting do
 
       expect(project.reload.ci_cd_settings.default_git_depth).to eq(0)
     end
+
+    context 'when feature flag :ci_set_project_default_git_depth is disabled' do
+      let(:project) { create(:project) }
+
+      before do
+        stub_feature_flags(ci_set_project_default_git_depth: { enabled: false } )
+      end
+
+      it 'does not set default value for new records' do
+        expect(project.ci_cd_settings.default_git_depth).to eq(nil)
+      end
+    end
   end
 end

spec/presenters/ci/build_runner_presenter_spec.rb

@@ -136,6 +136,16 @@ describe Ci::BuildRunnerPresenter do
     it 'defaults to git depth setting for the project' do
       expect(git_depth).to eq(build.project.default_git_depth)
     end
+
+    context 'when feature flag :ci_project_git_depth is disabled' do
+      before do
+        stub_feature_flags(ci_project_git_depth: { enabled: false })
+      end
+
+      it 'defaults to 0' do
+        expect(git_depth).to eq(0)
+      end
+    end
   end
 
   describe '#refspecs' do