Commit a90ae8f5 authored by Stan Hu's avatar Stan Hu

Merge branch 'dont_notify_sentry_about_pre_receive_errors' into 'master'

Don't notify Sentry about PreReceiveErrors

See merge request gitlab-org/gitlab!79558
parents 91ab07a0 245c4820
...@@ -21,7 +21,7 @@ module Branches ...@@ -21,7 +21,7 @@ module Branches
error("Failed to create branch '#{branch_name}': invalid reference name '#{ref}'") error("Failed to create branch '#{branch_name}': invalid reference name '#{ref}'")
end end
rescue Gitlab::Git::PreReceiveError => e rescue Gitlab::Git::PreReceiveError => e
Gitlab::ErrorTracking.track_exception(e, pre_receive_message: e.raw_message, branch_name: branch_name, ref: ref) Gitlab::ErrorTracking.log_exception(e, pre_receive_message: e.raw_message, branch_name: branch_name, ref: ref)
error(e.message) error(e.message)
end end
......
...@@ -65,7 +65,7 @@ RSpec.describe Branches::CreateService do ...@@ -65,7 +65,7 @@ RSpec.describe Branches::CreateService do
allow(project.repository).to receive(:add_branch).and_raise(pre_receive_error) allow(project.repository).to receive(:add_branch).and_raise(pre_receive_error)
expect(Gitlab::ErrorTracking).to receive(:track_exception).with( expect(Gitlab::ErrorTracking).to receive(:log_exception).with(
pre_receive_error, pre_receive_error,
pre_receive_message: raw_message, pre_receive_message: raw_message,
branch_name: 'new-feature', branch_name: 'new-feature',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment