Merge branch '201842-move-empty-rule-to-shared-folder' into 'master'

Move empty_rule into components directory

Closes #201842

See merge request gitlab-org/gitlab!30013

ee/app/assets/javascripts/approvals/components/mr_edit/empty_rule.vue → ee/app/assets/javascripts/approvals/components/empty_rule.vue

@@ -2,9 +2,9 @@
 import { mapActions } from 'vuex';
 import { GlDeprecatedButton } from '@gitlab/ui';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import RuleInput from './rule_input.vue';
-import EmptyRuleName from '../empty_rule_name.vue';
-import RuleBranches from '../rule_branches.vue';
+import RuleInput from './mr_edit/rule_input.vue';
+import EmptyRuleName from './empty_rule_name.vue';
+import RuleBranches from './rule_branches.vue';
 
 export default {
   components: {

ee/app/assets/javascripts/approvals/components/mr_edit/mr_rules.vue

@@ -5,7 +5,7 @@ import { RULE_TYPE_ANY_APPROVER, RULE_TYPE_REGULAR, RULE_NAME_ANY_APPROVER } fro
 import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
 import Rules from '../rules.vue';
 import RuleControls from '../rule_controls.vue';
-import EmptyRule from './empty_rule.vue';
+import EmptyRule from '../empty_rule.vue';
 import RuleInput from './rule_input.vue';
 
 let targetBranchMutationObserver;

ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue

@@ -5,7 +5,7 @@ import { RULE_TYPE_ANY_APPROVER, RULE_TYPE_REGULAR } from '../../constants';
 import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
 import Rules from '../rules.vue';
 import RuleControls from '../rule_controls.vue';
-import EmptyRule from '../mr_edit/empty_rule.vue';
+import EmptyRule from '../empty_rule.vue';
 import RuleInput from '../mr_edit/rule_input.vue';
 import RuleBranches from '../rule_branches.vue';
 

ee/spec/frontend/approvals/components/mr_edit/empty_rule_spec.js

 import { shallowMount } from '@vue/test-utils';
-import EmptyRule from 'ee/approvals/components/mr_edit/empty_rule.vue';
+import EmptyRule from 'ee/approvals/components/empty_rule.vue';
 import { GlDeprecatedButton } from '@gitlab/ui';
 
 describe('Empty Rule', () => {