Commit 732f4abe authored by Stan Hu's avatar Stan Hu

Merge branch '273726-feature-flag-remove-jira_issues_list' into 'master'

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

See merge request gitlab-org/gitlab!56465
parents d0f4d241 a731dff3
---
title: Update Jira issues list to use new UI components
merge_request: 56465
author:
type: changed
---
name: jira_issues_list
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45678
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273726
milestone: '13.6'
type: development
group: group::ecosystem
default_enabled: false
import initJiraIssuesList from 'ee/integrations/jira/issues_list/jira_issues_list_bundle';
import initIssuablesList from '~/issues_list';
document.addEventListener('DOMContentLoaded', () => {
if (gon.features.jiraIssuesList) {
initJiraIssuesList({
mountPointSelector: '#js-jira-issues-list',
});
} else {
initIssuablesList();
}
});
import initJiraIssuesList from 'ee/integrations/jira/issues_list/jira_issues_list_bundle';
initJiraIssuesList({ mountPointSelector: '.js-jira-issues-list' });
......@@ -15,10 +15,6 @@ module Projects
before_action :check_feature_enabled!
before_action :check_issues_show_enabled!, only: :show
before_action do
push_frontend_feature_flag(:jira_issues_list, project, type: :development)
end
rescue_from ::Projects::Integrations::Jira::IssuesFinder::IntegrationError, with: :render_integration_error
rescue_from ::Projects::Integrations::Jira::IssuesFinder::RequestError, with: :render_request_error
......
.nav-controls.issues-nav-controls
= link_to @project.external_issue_tracker.new_issue_url, class: 'btn gl-button gl-align-self-start', target: '_blank', rel: 'noopener noreferrer' do
= _('Create new issue in Jira')
= sprite_icon('external-link', css_class: 'gl-ml-1')
- page_title _('Jira Issues')
- add_page_specific_style 'page_bundles/issues_list'
- if Feature.enabled?(:jira_issues_list, @project, type: :development)
#js-jira-issues-list{ data: { issues_fetch_path: project_integrations_jira_issues_path(@project, format: :json),
page: params[:page],
initial_state: params[:state],
initial_sort_by: params[:sort],
project_full_path: @project.full_path,
issue_create_url: @project.external_issue_tracker.new_issue_url,
empty_state_path: image_path('illustrations/issues.svg') } }
- else
.top-area.gl-border-b-0.gl-mt-6
= render 'shared/issuable/nav', type: :issues, display_count: false
= render 'projects/integrations/jira/issues/nav_btns'
.js-issuables-list{ data: { endpoint: project_integrations_jira_issues_path(@project, format: :json),
'can-bulk-edit': false,
'empty-state-meta': { svg_path: image_path('illustrations/issues.svg') },
'sort-key': @sort,
type: 'jira',
'project-path': @project.full_path,
'scoped-labels-available': scoped_labels_available?(@project).to_json } }
.js-jira-issues-list{ data: { issues_fetch_path: project_integrations_jira_issues_path(@project, format: :json),
page: params[:page],
initial_state: params[:state],
initial_sort_by: params[:sort],
project_full_path: @project.full_path,
issue_create_url: @project.external_issue_tracker.new_issue_url,
empty_state_path: image_path('illustrations/issues.svg') } }
......@@ -9,9 +9,9 @@ RSpec.describe 'Jira issues list' do
before do
stub_licensed_features(jira_issues_integration: true)
stub_feature_flags(jira_issues_list: false)
project.add_user(user, :developer)
sign_in(user)
stub_request(:get, /.*jira.example.com.*/)
end
context 'when jira_issues_integration licensed feature is not available' do
......@@ -27,7 +27,7 @@ RSpec.describe 'Jira issues list' do
end
end
it 'renders "Create new issue" button' do
it 'renders "Create new issue" button', :js do
visit project_integrations_jira_issues_path(project)
expect(page).to have_link('Create new issue in Jira')
......
......@@ -8844,9 +8844,6 @@ msgstr ""
msgid "Create new file or directory"
msgstr ""
msgid "Create new issue in Jira"
msgstr ""
msgid "Create new label"
msgstr ""
......
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