Commit c76edfd0 authored by Samantha Ming's avatar Samantha Ming

Move empty_rule into components directory

- because this is a shared component and not a MR specific component
parent 21343680
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
import { mapActions } from 'vuex'; import { mapActions } from 'vuex';
import { GlDeprecatedButton } from '@gitlab/ui'; import { GlDeprecatedButton } from '@gitlab/ui';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import RuleInput from './rule_input.vue'; import RuleInput from './mr_edit/rule_input.vue';
import EmptyRuleName from '../empty_rule_name.vue'; import EmptyRuleName from './empty_rule_name.vue';
import RuleBranches from '../rule_branches.vue'; import RuleBranches from './rule_branches.vue';
export default { export default {
components: { components: {
......
...@@ -5,7 +5,7 @@ import { RULE_TYPE_ANY_APPROVER, RULE_TYPE_REGULAR, RULE_NAME_ANY_APPROVER } fro ...@@ -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 UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
import Rules from '../rules.vue'; import Rules from '../rules.vue';
import RuleControls from '../rule_controls.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'; import RuleInput from './rule_input.vue';
let targetBranchMutationObserver; let targetBranchMutationObserver;
......
...@@ -5,7 +5,7 @@ import { RULE_TYPE_ANY_APPROVER, RULE_TYPE_REGULAR } from '../../constants'; ...@@ -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 UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
import Rules from '../rules.vue'; import Rules from '../rules.vue';
import RuleControls from '../rule_controls.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 RuleInput from '../mr_edit/rule_input.vue';
import RuleBranches from '../rule_branches.vue'; import RuleBranches from '../rule_branches.vue';
......
import { shallowMount } from '@vue/test-utils'; 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'; import { GlDeprecatedButton } from '@gitlab/ui';
describe('Empty Rule', () => { describe('Empty Rule', () => {
......
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