Commit 2cff1ac7 authored by Nick Thomas's avatar Nick Thomas

Merge branch '10685-remove-feature-flag-ce' into 'master'

Remove `approval_rules` feature flag and remove obsolete approvals implementation

See merge request gitlab-org/gitlab-ce!28979
parents d2ea6154 eabc7289
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
> Introduced in [GitLab Enterprise Edition 7.12](https://about.gitlab.com/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only). > Introduced in [GitLab Enterprise Edition 7.12](https://about.gitlab.com/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only).
NOTE: **Note:** NOTE: **Note:**
If you are running a self-managed instance, the new interface shown on Prior to 12.0, if you are running a self-managed instance, the new interface shown on
this page will not be available unless the feature flag this page will not be available unless the feature flag
`approval_rules` is enabled, which can be done from the Rails console by `approval_rules` is enabled, which can be done from the Rails console by
instance administrators. instance administrators.
......
...@@ -8,8 +8,6 @@ describe "User creates a merge request", :js do ...@@ -8,8 +8,6 @@ describe "User creates a merge request", :js do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
stub_feature_flags(approval_rules: false)
project.add_maintainer(user) project.add_maintainer(user)
sign_in(user) sign_in(user)
end end
......
...@@ -7,7 +7,6 @@ describe 'Projects > Settings > For a forked project', :js do ...@@ -7,7 +7,6 @@ describe 'Projects > Settings > For a forked project', :js do
let(:forked_project) { fork_project(original_project, user) } let(:forked_project) { fork_project(original_project, user) }
before do before do
stub_feature_flags(approval_rules: false)
original_project.add_maintainer(user) original_project.add_maintainer(user)
forked_project.add_maintainer(user) forked_project.add_maintainer(user)
sign_in(user) sign_in(user)
......
...@@ -6,7 +6,6 @@ describe 'Project' do ...@@ -6,7 +6,6 @@ describe 'Project' do
before do before do
stub_feature_flags(vue_file_list: false) stub_feature_flags(vue_file_list: false)
stub_feature_flags(approval_rules: false)
end end
describe 'creating from template' do describe 'creating from template' do
......
...@@ -21,7 +21,6 @@ describe('mrWidgetOptions', () => { ...@@ -21,7 +21,6 @@ describe('mrWidgetOptions', () => {
const COLLABORATION_MESSAGE = 'Allows commits from members who can merge to the target branch'; const COLLABORATION_MESSAGE = 'Allows commits from members who can merge to the target branch';
beforeEach(() => { beforeEach(() => {
gon.features = { approvalRules: false };
// Prevent component mounting // Prevent component mounting
delete mrWidgetOptions.el; delete mrWidgetOptions.el;
...@@ -32,7 +31,6 @@ describe('mrWidgetOptions', () => { ...@@ -32,7 +31,6 @@ describe('mrWidgetOptions', () => {
}); });
afterEach(() => { afterEach(() => {
gon.features = null;
vm.$destroy(); vm.$destroy();
}); });
......
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