diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 09:08:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 09:08:41 +0300 |
commit | 66c3e34b4f4931f613a6ff65435c19e9373c2a6a (patch) | |
tree | ed8ade5810abde1947fcc0e2b6231c0be82f327d /app/assets/javascripts/jira_connect | |
parent | a6ebd13ef8a8b95d7b12a442fdb99b03092e98ba (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jira_connect')
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/.eslintrc.yml (renamed from app/assets/javascripts/jira_connect/.eslintrc.yml) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/api.js (renamed from app/assets/javascripts/jira_connect/api.js) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/components/app.vue (renamed from app/assets/javascripts/jira_connect/components/app.vue) | 2 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/components/group_item_name.vue (renamed from app/assets/javascripts/jira_connect/components/group_item_name.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/components/groups_list.vue (renamed from app/assets/javascripts/jira_connect/components/groups_list.vue) | 7 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/components/groups_list_item.vue (renamed from app/assets/javascripts/jira_connect/components/groups_list_item.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/components/subscriptions_list.vue (renamed from app/assets/javascripts/jira_connect/components/subscriptions_list.vue) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/constants.js (renamed from app/assets/javascripts/jira_connect/constants.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/index.js (renamed from app/assets/javascripts/jira_connect/index.js) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/store/index.js (renamed from app/assets/javascripts/jira_connect/store/index.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/store/mutation_types.js (renamed from app/assets/javascripts/jira_connect/store/mutation_types.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/store/mutations.js (renamed from app/assets/javascripts/jira_connect/store/mutations.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/store/state.js (renamed from app/assets/javascripts/jira_connect/store/state.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/jira_connect/subscriptions/utils.js (renamed from app/assets/javascripts/jira_connect/utils.js) | 0 |
14 files changed, 13 insertions, 10 deletions
diff --git a/app/assets/javascripts/jira_connect/.eslintrc.yml b/app/assets/javascripts/jira_connect/subscriptions/.eslintrc.yml index 053f8c6b285..053f8c6b285 100644 --- a/app/assets/javascripts/jira_connect/.eslintrc.yml +++ b/app/assets/javascripts/jira_connect/subscriptions/.eslintrc.yml diff --git a/app/assets/javascripts/jira_connect/api.js b/app/assets/javascripts/jira_connect/subscriptions/api.js index abf2c070e68..14947b6c835 100644 --- a/app/assets/javascripts/jira_connect/api.js +++ b/app/assets/javascripts/jira_connect/subscriptions/api.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import { getJwt } from '~/jira_connect/utils'; +import { getJwt } from './utils'; export const addSubscription = async (addPath, namespace) => { const jwt = await getJwt(); diff --git a/app/assets/javascripts/jira_connect/components/app.vue b/app/assets/javascripts/jira_connect/subscriptions/components/app.vue index ff4dfb23687..413424be28d 100644 --- a/app/assets/javascripts/jira_connect/components/app.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/components/app.vue @@ -1,7 +1,7 @@ <script> import { GlAlert, GlButton, GlLink, GlModal, GlModalDirective, GlSprintf } from '@gitlab/ui'; import { mapState, mapMutations } from 'vuex'; -import { retrieveAlert, getLocation } from '~/jira_connect/utils'; +import { retrieveAlert, getLocation } from '~/jira_connect/subscriptions/utils'; import { __ } from '~/locale'; import { SET_ALERT } from '../store/mutation_types'; import GroupsList from './groups_list.vue'; diff --git a/app/assets/javascripts/jira_connect/components/group_item_name.vue b/app/assets/javascripts/jira_connect/subscriptions/components/group_item_name.vue index e6c172dae9e..e6c172dae9e 100644 --- a/app/assets/javascripts/jira_connect/components/group_item_name.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/components/group_item_name.vue diff --git a/app/assets/javascripts/jira_connect/components/groups_list.vue b/app/assets/javascripts/jira_connect/subscriptions/components/groups_list.vue index 55233bb6326..5a49d7c1a90 100644 --- a/app/assets/javascripts/jira_connect/components/groups_list.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/components/groups_list.vue @@ -1,7 +1,10 @@ <script> import { GlLoadingIcon, GlPagination, GlAlert, GlSearchBoxByType } from '@gitlab/ui'; -import { fetchGroups } from '~/jira_connect/api'; -import { DEFAULT_GROUPS_PER_PAGE, MINIMUM_SEARCH_TERM_LENGTH } from '~/jira_connect/constants'; +import { fetchGroups } from '~/jira_connect/subscriptions/api'; +import { + DEFAULT_GROUPS_PER_PAGE, + MINIMUM_SEARCH_TERM_LENGTH, +} from '~/jira_connect/subscriptions/constants'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { s__ } from '~/locale'; import GroupsListItem from './groups_list_item.vue'; diff --git a/app/assets/javascripts/jira_connect/components/groups_list_item.vue b/app/assets/javascripts/jira_connect/subscriptions/components/groups_list_item.vue index ad046920dd1..ed7585e8a88 100644 --- a/app/assets/javascripts/jira_connect/components/groups_list_item.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/components/groups_list_item.vue @@ -1,8 +1,8 @@ <script> import { GlButton } from '@gitlab/ui'; import { helpPagePath } from '~/helpers/help_page_helper'; -import { addSubscription } from '~/jira_connect/api'; -import { persistAlert, reloadPage } from '~/jira_connect/utils'; +import { addSubscription } from '~/jira_connect/subscriptions/api'; +import { persistAlert, reloadPage } from '~/jira_connect/subscriptions/utils'; import { s__ } from '~/locale'; import GroupItemName from './group_item_name.vue'; diff --git a/app/assets/javascripts/jira_connect/components/subscriptions_list.vue b/app/assets/javascripts/jira_connect/subscriptions/components/subscriptions_list.vue index a606e2edbbb..7062fb370ed 100644 --- a/app/assets/javascripts/jira_connect/components/subscriptions_list.vue +++ b/app/assets/javascripts/jira_connect/subscriptions/components/subscriptions_list.vue @@ -2,8 +2,8 @@ import { GlButton, GlEmptyState, GlTable } from '@gitlab/ui'; import { isEmpty } from 'lodash'; import { mapMutations } from 'vuex'; -import { removeSubscription } from '~/jira_connect/api'; -import { reloadPage } from '~/jira_connect/utils'; +import { removeSubscription } from '~/jira_connect/subscriptions/api'; +import { reloadPage } from '~/jira_connect/subscriptions/utils'; import { __, s__ } from '~/locale'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { SET_ALERT } from '../store/mutation_types'; diff --git a/app/assets/javascripts/jira_connect/constants.js b/app/assets/javascripts/jira_connect/subscriptions/constants.js index 8dff83eabb5..8dff83eabb5 100644 --- a/app/assets/javascripts/jira_connect/constants.js +++ b/app/assets/javascripts/jira_connect/subscriptions/constants.js diff --git a/app/assets/javascripts/jira_connect/index.js b/app/assets/javascripts/jira_connect/subscriptions/index.js index bc0d21c6c9a..f1262be0174 100644 --- a/app/assets/javascripts/jira_connect/index.js +++ b/app/assets/javascripts/jira_connect/subscriptions/index.js @@ -1,13 +1,13 @@ -import '../webpack'; +import '../../webpack'; import setConfigs from '@gitlab/ui/dist/config'; import Vue from 'vue'; -import { getLocation, sizeToParent } from '~/jira_connect/utils'; import GlFeatureFlagsPlugin from '~/vue_shared/gl_feature_flags_plugin'; import Translate from '~/vue_shared/translate'; import JiraConnectApp from './components/app.vue'; import createStore from './store'; +import { getLocation, sizeToParent } from './utils'; const store = createStore(); diff --git a/app/assets/javascripts/jira_connect/store/index.js b/app/assets/javascripts/jira_connect/subscriptions/store/index.js index de830e3891a..de830e3891a 100644 --- a/app/assets/javascripts/jira_connect/store/index.js +++ b/app/assets/javascripts/jira_connect/subscriptions/store/index.js diff --git a/app/assets/javascripts/jira_connect/store/mutation_types.js b/app/assets/javascripts/jira_connect/subscriptions/store/mutation_types.js index 15f36b824d9..15f36b824d9 100644 --- a/app/assets/javascripts/jira_connect/store/mutation_types.js +++ b/app/assets/javascripts/jira_connect/subscriptions/store/mutation_types.js diff --git a/app/assets/javascripts/jira_connect/store/mutations.js b/app/assets/javascripts/jira_connect/subscriptions/store/mutations.js index 2a25e0fe25f..2a25e0fe25f 100644 --- a/app/assets/javascripts/jira_connect/store/mutations.js +++ b/app/assets/javascripts/jira_connect/subscriptions/store/mutations.js diff --git a/app/assets/javascripts/jira_connect/store/state.js b/app/assets/javascripts/jira_connect/subscriptions/store/state.js index c807df03f00..c807df03f00 100644 --- a/app/assets/javascripts/jira_connect/store/state.js +++ b/app/assets/javascripts/jira_connect/subscriptions/store/state.js diff --git a/app/assets/javascripts/jira_connect/utils.js b/app/assets/javascripts/jira_connect/subscriptions/utils.js index ecd1a31339a..ecd1a31339a 100644 --- a/app/assets/javascripts/jira_connect/utils.js +++ b/app/assets/javascripts/jira_connect/subscriptions/utils.js |