Commit da1aa147 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch '276619-remove-feature-flag' into 'master'

Remove feature flag release_mr_issue_urls [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!63609
parents e6937bda 520387fa
...@@ -26,32 +26,22 @@ class ReleasePresenter < Gitlab::View::Presenter::Delegated ...@@ -26,32 +26,22 @@ class ReleasePresenter < Gitlab::View::Presenter::Delegated
end end
def opened_merge_requests_url def opened_merge_requests_url
return unless release_mr_issue_urls_available?
project_merge_requests_url(project, params_for_issues_and_mrs) project_merge_requests_url(project, params_for_issues_and_mrs)
end end
def merged_merge_requests_url def merged_merge_requests_url
return unless release_mr_issue_urls_available?
project_merge_requests_url(project, params_for_issues_and_mrs(state: 'merged')) project_merge_requests_url(project, params_for_issues_and_mrs(state: 'merged'))
end end
def closed_merge_requests_url def closed_merge_requests_url
return unless release_mr_issue_urls_available?
project_merge_requests_url(project, params_for_issues_and_mrs(state: 'closed')) project_merge_requests_url(project, params_for_issues_and_mrs(state: 'closed'))
end end
def opened_issues_url def opened_issues_url
return unless release_mr_issue_urls_available?
project_issues_url(project, params_for_issues_and_mrs) project_issues_url(project, params_for_issues_and_mrs)
end end
def closed_issues_url def closed_issues_url
return unless release_mr_issue_urls_available?
project_issues_url(project, params_for_issues_and_mrs(state: 'closed')) project_issues_url(project, params_for_issues_and_mrs(state: 'closed'))
end end
...@@ -89,10 +79,6 @@ class ReleasePresenter < Gitlab::View::Presenter::Delegated ...@@ -89,10 +79,6 @@ class ReleasePresenter < Gitlab::View::Presenter::Delegated
{ scope: 'all', state: state, release_tag: release.tag } { scope: 'all', state: state, release_tag: release.tag }
end end
def release_mr_issue_urls_available?
::Feature.enabled?(:release_mr_issue_urls, project, default_enabled: true)
end
def release_edit_page_available? def release_edit_page_available?
can?(current_user, :update_release, release) can?(current_user, :update_release, release)
end end
......
---
name: release_mr_issue_urls
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18727
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276619
milestone: '12.4'
type: development
group: group::release
default_enabled: true
...@@ -77,14 +77,6 @@ RSpec.describe ReleasePresenter do ...@@ -77,14 +77,6 @@ RSpec.describe ReleasePresenter do
it 'returns merge requests url with state=open' do it 'returns merge requests url with state=open' do
is_expected.to eq(project_merge_requests_url(project, opened_url_params)) is_expected.to eq(project_merge_requests_url(project, opened_url_params))
end end
context 'when release_mr_issue_urls feature flag is disabled' do
before do
stub_feature_flags(release_mr_issue_urls: false)
end
it { is_expected.to be_nil }
end
end end
describe '#merged_merge_requests_url' do describe '#merged_merge_requests_url' do
...@@ -93,14 +85,6 @@ RSpec.describe ReleasePresenter do ...@@ -93,14 +85,6 @@ RSpec.describe ReleasePresenter do
it 'returns merge requests url with state=merged' do it 'returns merge requests url with state=merged' do
is_expected.to eq(project_merge_requests_url(project, merged_url_params)) is_expected.to eq(project_merge_requests_url(project, merged_url_params))
end end
context 'when release_mr_issue_urls feature flag is disabled' do
before do
stub_feature_flags(release_mr_issue_urls: false)
end
it { is_expected.to be_nil }
end
end end
describe '#closed_merge_requests_url' do describe '#closed_merge_requests_url' do
...@@ -109,14 +93,6 @@ RSpec.describe ReleasePresenter do ...@@ -109,14 +93,6 @@ RSpec.describe ReleasePresenter do
it 'returns merge requests url with state=closed' do it 'returns merge requests url with state=closed' do
is_expected.to eq(project_merge_requests_url(project, closed_url_params)) is_expected.to eq(project_merge_requests_url(project, closed_url_params))
end end
context 'when release_mr_issue_urls feature flag is disabled' do
before do
stub_feature_flags(release_mr_issue_urls: false)
end
it { is_expected.to be_nil }
end
end end
describe '#opened_issues_url' do describe '#opened_issues_url' do
...@@ -125,14 +101,6 @@ RSpec.describe ReleasePresenter do ...@@ -125,14 +101,6 @@ RSpec.describe ReleasePresenter do
it 'returns issues url with state=open' do it 'returns issues url with state=open' do
is_expected.to eq(project_issues_url(project, opened_url_params)) is_expected.to eq(project_issues_url(project, opened_url_params))
end end
context 'when release_mr_issue_urls feature flag is disabled' do
before do
stub_feature_flags(release_mr_issue_urls: false)
end
it { is_expected.to be_nil }
end
end end
describe '#closed_issues_url' do describe '#closed_issues_url' do
...@@ -141,14 +109,6 @@ RSpec.describe ReleasePresenter do ...@@ -141,14 +109,6 @@ RSpec.describe ReleasePresenter do
it 'returns issues url with state=closed' do it 'returns issues url with state=closed' do
is_expected.to eq(project_issues_url(project, closed_url_params)) is_expected.to eq(project_issues_url(project, closed_url_params))
end end
context 'when release_mr_issue_urls feature flag is disabled' do
before do
stub_feature_flags(release_mr_issue_urls: false)
end
it { is_expected.to be_nil }
end
end end
describe '#edit_url' do describe '#edit_url' do
......
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