Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c76edfd0
Commit
c76edfd0
authored
Apr 20, 2020
by
Samantha Ming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move empty_rule into components directory
- because this is a shared component and not a MR specific component
parent
21343680
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/assets/javascripts/approvals/components/empty_rule.vue
...pp/assets/javascripts/approvals/components/empty_rule.vue
+3
-3
ee/app/assets/javascripts/approvals/components/mr_edit/mr_rules.vue
...ets/javascripts/approvals/components/mr_edit/mr_rules.vue
+1
-1
ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue
...s/approvals/components/project_settings/project_rules.vue
+1
-1
ee/spec/frontend/approvals/components/mr_edit/empty_rule_spec.js
.../frontend/approvals/components/mr_edit/empty_rule_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/approvals/components/
mr_edit/
empty_rule.vue
→
ee/app/assets/javascripts/approvals/components/empty_rule.vue
View file @
c76edfd0
...
...
@@ -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
View file @
c76edfd0
...
...
@@ -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
View file @
c76edfd0
...
...
@@ -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
View file @
c76edfd0
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
'
,
()
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment