remove out-of-context changes

a3bb9546 · Micaël Bergeron · fc1256b2 · a3bb9546 · a3bb9546
Commit a3bb9546 authored Mar 20, 2018 by Micaël Bergeron
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

app/models/merge_request_diff.rb app/models/merge_request_diff.rb +4 -0

config/sidekiq_queues.yml config/sidekiq_queues.yml +0 -2

No files found.
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -197,6 +197,10 @@ class MergeRequestDiff < ActiveRecord::Base
    CompareService.new(project, head_commit_sha).execute(project, sha, straight: true)
  end

+  def commits_count
+    super || merge_request_diff_commits.size
+  end
+
  private

  def create_merge_request_diff_files(diffs)

--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -89,8 +89,6 @@
  - [elastic_indexer, 1]
  - [elastic_commit_indexer, 1]
  - [export_csv, 1]
-  - [object_storage_upload, 1]
-  - [object_storage, 1]

  # Deprecated queues: Remove after 10.7
  - geo_base_scheduler