Commit 6b1befb8 authored by Douwe Maan's avatar Douwe Maan

Merge branch '11467-remove-feature-flag-for-visual-review-app-button' into 'master'

Resolve "Remove feature flag for Visual Review App Button"

Closes #11467

See merge request gitlab-org/gitlab-ee!14958
parents 4aedd763 23cb9c65
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
return this.isPostMerge ? this.mr.mergePipeline : this.mr.pipeline; return this.isPostMerge ? this.mr.mergePipeline : this.mr.pipeline;
}, },
showVisualReviewAppLink() { showVisualReviewAppLink() {
return Boolean(this.mr.visualReviewFF && this.mr.visualReviewAppAvailable); return this.mr.visualReviewAppAvailable;
}, },
showMergeTrainInfo() { showMergeTrainInfo() {
return _.isNumber(this.mr.mergeTrainIndex); return _.isNumber(this.mr.mergeTrainIndex);
......
...@@ -30,8 +30,7 @@ export default class MergeRequestStore extends CEMergeRequestStore { ...@@ -30,8 +30,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
this.canCreateMergeRequest = Boolean(this.createVulnerabilityFeedbackMergeRequestPath); this.canCreateMergeRequest = Boolean(this.createVulnerabilityFeedbackMergeRequestPath);
this.canDismissVulnerability = Boolean(this.createVulnerabilityFeedbackDismissalPath); this.canDismissVulnerability = Boolean(this.createVulnerabilityFeedbackDismissalPath);
this.canCreateFeedback = data.can_create_feedback || false; this.canCreateFeedback = data.can_create_feedback || false;
this.visualReviewAppAvailable = data.visual_review_app_available; this.visualReviewAppAvailable = Boolean(data.visual_review_app_available);
this.visualReviewFF = gon && gon.features && gon.features.visualReviewApp;
this.appUrl = gon && gon.gitlab_url; this.appUrl = gon && gon.gitlab_url;
this.initCodeclimate(data); this.initCodeclimate(data);
......
...@@ -8,10 +8,6 @@ module EE ...@@ -8,10 +8,6 @@ module EE
APPROVAL_RENDERING_ACTIONS = [:approve, :approvals, :unapprove].freeze APPROVAL_RENDERING_ACTIONS = [:approve, :approvals, :unapprove].freeze
prepended do prepended do
before_action only: [:show] do
push_frontend_feature_flag(:visual_review_app, merge_request.project, default_enabled: true)
end
before_action :whitelist_query_limiting_ee_merge, only: [:merge] before_action :whitelist_query_limiting_ee_merge, only: [:merge]
before_action :whitelist_query_limiting_ee_show, only: [:show] before_action :whitelist_query_limiting_ee_show, only: [:show]
end end
......
---
title: Remove visual review app feature flag
merge_request: 14958
author:
type: fixed
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