diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-25 06:08:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-25 06:08:51 +0000 |
| commit | 7f15f475306e60325cc9e86977f38680987e5c38 (patch) | |
| tree | 33e2b7faa3a4c992bdb7d62a429da08794ad3d9f /app | |
| parent | 82711b60d5666dcc608cf6b35d8c32ca9b582593 (diff) | |
| download | gitlab-ce-7f15f475306e60325cc9e86977f38680987e5c38.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
5 files changed, 3 insertions, 11 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) |