diff options
9 files changed, 14 insertions, 31 deletions
diff --git a/app/assets/javascripts/pages/projects/incidents/show/index.js b/app/assets/javascripts/pages/projects/incidents/show/index.js index 5b3f03cd57e..850bb8da5e7 100644 --- a/app/assets/javascripts/pages/projects/incidents/show/index.js +++ b/app/assets/javascripts/pages/projects/incidents/show/index.js @@ -3,7 +3,5 @@ import initRelatedIssues from '~/related_issues'; import initShow from '../../issues/show'; initShow(); -if (!gon.features?.vueIssuableSidebar) { - initSidebarBundle(); -} +initSidebarBundle(); initRelatedIssues(); diff --git a/app/assets/javascripts/pages/projects/issues/show/index.js b/app/assets/javascripts/pages/projects/issues/show/index.js index 630add51a97..64f34633db3 100644 --- a/app/assets/javascripts/pages/projects/issues/show/index.js +++ b/app/assets/javascripts/pages/projects/issues/show/index.js @@ -3,7 +3,5 @@ import initRelatedIssues from '~/related_issues'; import initShow from '../show'; initShow(); -if (gon.features && !gon.features.vueIssuableSidebar) { - initSidebarBundle(); -} +initSidebarBundle(); initRelatedIssues(); diff --git a/app/assets/javascripts/pages/projects/merge_requests/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/show/index.js index 602d749ee07..518c844fda6 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/show/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/show/index.js @@ -6,9 +6,7 @@ import initIssuableHeaderWarning from '~/vue_shared/components/issuable/init_iss import store from '~/mr_notes/stores'; initShow(); -if (gon.features && !gon.features.vueIssuableSidebar) { - initSidebarBundle(); -} +initSidebarBundle(); initMrNotes(); initReviewBar(); initIssuableHeaderWarning(store); diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 3a0e40f9745..9418fda97e0 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -41,7 +41,6 @@ class Projects::IssuesController < Projects::ApplicationController before_action :create_rate_limit, only: [:create] before_action do - push_frontend_feature_flag(:vue_issuable_sidebar, project.group) push_frontend_feature_flag(:tribute_autocomplete, @project) push_frontend_feature_flag(:vue_issuables_list, project) push_frontend_feature_flag(:usage_data_design_action, project, default_enabled: true) diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 27402573c42..f8647881645 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -48,7 +48,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo end before_action do - push_frontend_feature_flag(:vue_issuable_sidebar, @project.group) push_frontend_feature_flag(:merge_request_reviewers, @project, default_enabled: true) push_frontend_feature_flag(:mr_collapsed_approval_rules, @project) push_frontend_feature_flag(:reviewer_approval_rules, @project, default_enabled: :yaml) diff --git a/changelogs/unreleased/270130-policy-preview-for-egress-deny-all-reports-egress-allow-all.yml b/changelogs/unreleased/270130-policy-preview-for-egress-deny-all-reports-egress-allow-all.yml new file mode 100644 index 00000000000..3797c251e2e --- /dev/null +++ b/changelogs/unreleased/270130-policy-preview-for-egress-deny-all-reports-egress-allow-all.yml @@ -0,0 +1,5 @@ +--- +title: Correct the egress 'deny all' policy preview from Allow to Deny +merge_request: 52370 +author: +type: fixed diff --git a/config/feature_flags/development/vue_issuable_sidebar.yml b/config/feature_flags/development/vue_issuable_sidebar.yml deleted file mode 100644 index 8f35e7699b2..00000000000 --- a/config/feature_flags/development/vue_issuable_sidebar.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: vue_issuable_sidebar -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18199 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292802 -milestone: '12.4' -type: development -group: group::project management -default_enabled: false diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 99d0136630f..476659c0c60 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -18836,12 +18836,6 @@ msgstr "" msgid "NetworkPolicies|Allow" msgstr "" -msgid "NetworkPolicies|Allow all inbound traffic to %{selector} from %{ruleSelector} on %{ports}" -msgstr "" - -msgid "NetworkPolicies|Allow all outbound traffic from %{selector} to %{ruleSelector} on %{ports}" -msgstr "" - msgid "NetworkPolicies|Are you sure you want to delete this policy? This action cannot be undone." msgstr "" @@ -18860,6 +18854,12 @@ msgstr "" msgid "NetworkPolicies|Delete policy: %{policy}" msgstr "" +msgid "NetworkPolicies|Deny all inbound traffic to %{selector} from %{ruleSelector} on %{ports}" +msgstr "" + +msgid "NetworkPolicies|Deny all outbound traffic from %{selector} to %{ruleSelector} on %{ports}" +msgstr "" + msgid "NetworkPolicies|Deny all traffic" msgstr "" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7b3d413c02b..89b13591c7e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -216,12 +216,6 @@ RSpec.configure do |config| # (ie. ApplicationSetting#auto_devops_enabled) stub_feature_flags(force_autodevops_on_by_default: false) - # The following can be removed once Vue Issuable Sidebar - # is feature-complete and can be made default in place - # of older sidebar. - # See https://gitlab.com/groups/gitlab-org/-/epics/1863 - stub_feature_flags(vue_issuable_sidebar: false) - # Merge request widget GraphQL requests are disabled in the tests # for now whilst we migrate as much as we can over the GraphQL stub_feature_flags(merge_request_widget_graphql: false) |