mirror of
https://gitlab.com/gitlab-org/gitlab-foss.git
synced 2025-07-23 00:47:51 +00:00
Update from merge request
This commit is contained in:
@ -78,7 +78,7 @@ class DiffNote < Note
|
||||
end
|
||||
|
||||
creation_params = diff_file.diff.to_hash
|
||||
.except(:too_large, :generated, :encoded_file_path)
|
||||
.except(:too_large, :generated, :encoded_file_path, :binary)
|
||||
.merge(diff: diff_file.diff_hunk(diff_line))
|
||||
|
||||
create_note_diff_file(creation_params)
|
||||
|
@ -479,6 +479,10 @@
|
||||
- 1
|
||||
- - gitlab_subscriptions_seat_assignments_group_links_create_or_update_seats
|
||||
- 1
|
||||
- - gitlab_subscriptions_seat_assignments_member_transfers_create_group_seats
|
||||
- 1
|
||||
- - gitlab_subscriptions_seat_assignments_member_transfers_create_project_seats
|
||||
- 1
|
||||
- - gitlab_subscriptions_self_managed_duo_core_todo_notification
|
||||
- 1
|
||||
- - gitlab_subscriptions_trials_apply_trial
|
||||
|
@ -3,7 +3,10 @@
|
||||
module Gitlab
|
||||
module GitalyClient
|
||||
class Diff
|
||||
ATTRS = %i[from_path to_path old_mode new_mode from_id to_id patch overflow_marker collapsed too_large].freeze
|
||||
# Attributes exposed from Gitaly's CommitDiffResponse
|
||||
ATTRS = %i[
|
||||
from_path to_path old_mode new_mode from_id to_id patch overflow_marker collapsed too_large binary
|
||||
].freeze
|
||||
|
||||
include AttributesBag
|
||||
end
|
||||
|
@ -13,7 +13,8 @@ RSpec.describe Gitlab::GitalyClient::Diff do
|
||||
to_id: '8e5177d718c561d36efde08bad36b43687ee6bf0',
|
||||
patch: 'a' * 100,
|
||||
collapsed: false,
|
||||
too_large: false
|
||||
too_large: false,
|
||||
binary: false
|
||||
}
|
||||
end
|
||||
|
||||
@ -28,6 +29,7 @@ RSpec.describe Gitlab::GitalyClient::Diff do
|
||||
it { is_expected.to respond_to(:patch) }
|
||||
it { is_expected.to respond_to(:collapsed) }
|
||||
it { is_expected.to respond_to(:too_large) }
|
||||
it { is_expected.to respond_to(:binary) }
|
||||
|
||||
describe '#==' do
|
||||
it { expect(subject).to eq(described_class.new(diff_fields)) }
|
||||
|
Reference in New Issue
Block a user