diff options
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index e286a4e57f2..0d0a388bc02 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -42,7 +42,7 @@ class MergeRequestDiff < ActiveRecord::Base scope :with_files, -> { without_states(:without_files, :empty) } scope :viewable, -> { without_state(:empty) } scope :by_commit_sha, ->(sha) do - joins(:merge_request_diff_commits).where(merge_request_diff_commits: { sha: sha }).reorder(nil) + joins(:merge_request_diff_commits).where(merge_request_diff_commits: {sha: sha}).reorder(nil) end scope :recent, -> { order(id: :desc).limit(100) } @@ -67,8 +67,8 @@ class MergeRequestDiff < ActiveRecord::Base # and save it to the database as serialized data def save_git_content MergeRequest - .where('id = ? AND COALESCE(latest_merge_request_diff_id, 0) < ?', self.merge_request_id, self.id) - .update_all(latest_merge_request_diff_id: self.id) + .where("id = ? AND COALESCE(latest_merge_request_diff_id, 0) < ?", merge_request_id, id) + .update_all(latest_merge_request_diff_id: id) ensure_commit_shas save_commits @@ -163,9 +163,9 @@ class MergeRequestDiff < ActiveRecord::Base return unless start_commit_sha || base_commit_sha Gitlab::Diff::DiffRefs.new( - base_sha: base_commit_sha, + base_sha: base_commit_sha, start_sha: start_commit_sha, - head_sha: head_commit_sha + head_sha: head_commit_sha ) end @@ -186,9 +186,9 @@ class MergeRequestDiff < ActiveRecord::Base likely_base_commit_sha = (first_commit&.parent || first_commit)&.sha Gitlab::Diff::DiffRefs.new( - base_sha: likely_base_commit_sha, + base_sha: likely_base_commit_sha, start_sha: safe_start_commit_sha, - head_sha: head_commit_sha + head_sha: head_commit_sha ) end @@ -229,7 +229,7 @@ class MergeRequestDiff < ActiveRecord::Base end def latest? - self.id == merge_request.latest_merge_request_diff_id + id == merge_request.latest_merge_request_diff_id end # rubocop: disable CodeReuse/ServiceClass @@ -249,7 +249,7 @@ class MergeRequestDiff < ActiveRecord::Base # Carrierwave defines `write_uploader` dynamically on this class, so `super` # does not work. Alias the carrierwave method so we can call it when needed - alias_method :carrierwave_write_uploader, :write_uploader + alias carrierwave_write_uploader write_uploader # The `external_diff`, `external_diff_store`, and `stored_externally` # columns were introduced in GitLab 11.8, but some background migration specs @@ -274,7 +274,7 @@ class MergeRequestDiff < ActiveRecord::Base def stored_externally super if has_attribute?(:stored_externally) end - alias_method :stored_externally?, :stored_externally + alias stored_externally? stored_externally # If enabled, yields the external file containing the diff. Otherwise, yields # nil. This method is not thread-safe, but it *is* re-entrant, which allows @@ -284,13 +284,11 @@ class MergeRequestDiff < ActiveRecord::Base return yield(@external_diff_file) if @external_diff_file external_diff.open do |file| - begin - @external_diff_file = file + @external_diff_file = file - yield(@external_diff_file) - ensure - @external_diff_file = nil - end + yield(@external_diff_file) + ensure + @external_diff_file = nil end end @@ -305,7 +303,7 @@ class MergeRequestDiff < ActiveRecord::Base end # Faster inserts - Gitlab::Database.bulk_insert('merge_request_diff_files', rows) + Gitlab::Database.bulk_insert("merge_request_diff_files", rows) end def build_external_merge_request_diff_files(diffs) @@ -340,7 +338,7 @@ class MergeRequestDiff < ActiveRecord::Base diffs.map.with_index do |diff, index| diff_hash = diff.to_hash.merge( binary: false, - merge_request_diff_id: self.id, + merge_request_diff_id: id, relative_order: index ) @@ -350,7 +348,7 @@ class MergeRequestDiff < ActiveRecord::Base if diff_text.encoding == Encoding::BINARY && !diff_text.ascii_only? hash[:binary] = true - hash[:diff] = [diff_text].pack('m0') + hash[:diff] = [diff_text].pack("m0") end end end @@ -363,7 +361,7 @@ class MergeRequestDiff < ActiveRecord::Base collection = merge_request_diff_files if paths = options[:paths] - collection = collection.where('old_path IN (?) OR new_path IN (?)', paths, paths) + collection = collection.where("old_path IN (?) OR new_path IN (?)", paths, paths) end Gitlab::Git::DiffCollection.new(collection.map(&:to_hash), options) @@ -404,7 +402,7 @@ class MergeRequestDiff < ActiveRecord::Base end def save_commits - MergeRequestDiffCommit.create_bulk(self.id, compare.commits.reverse) + MergeRequestDiffCommit.create_bulk(id, compare.commits.reverse) # merge_request_diff_commits.reload is preferred way to reload associated # objects but it returns cached result for some reason in this case |