Commit 4e5f8303 authored by Alex Kalderimis's avatar Alex Kalderimis

Merge branch 'sh-drop-jira_use_first_ref_by_oid' into 'master'

Drop jira_use_first_ref_by_oid feature flag

See merge request gitlab-org/gitlab!76611
parents 0d348ac7 ce5c275e
...@@ -303,11 +303,7 @@ module Integrations ...@@ -303,11 +303,7 @@ module Integrations
private private
def branch_name(commit) def branch_name(commit)
if Feature.enabled?(:jira_use_first_ref_by_oid, project, default_enabled: :yaml)
commit.first_ref_by_oid(project.repository) commit.first_ref_by_oid(project.repository)
else
commit.ref_names(project.repository).first
end
end end
def server_info def server_info
......
---
name: jira_use_first_ref_by_oid
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72739
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343585
milestone: '14.5'
type: development
group: group::integrations
default_enabled: true
...@@ -937,18 +937,6 @@ RSpec.describe Integrations::Jira do ...@@ -937,18 +937,6 @@ RSpec.describe Integrations::Jira do
end end
end end
context 'with jira_use_first_ref_by_oid feature flag disabled' do
before do
stub_feature_flags(jira_use_first_ref_by_oid: false)
end
it 'creates a comment and remote link on Jira' do
expect(subject).to eq(success_message)
expect(WebMock).to have_requested(:post, comment_url).with(body: comment_body).once
expect(WebMock).to have_requested(:post, remote_link_url).once
end
end
it 'tracks usage' do it 'tracks usage' do
expect(Gitlab::UsageDataCounters::HLLRedisCounter) expect(Gitlab::UsageDataCounters::HLLRedisCounter)
.to receive(:track_event) .to receive(:track_event)
......
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