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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
9167989f
Commit
9167989f
authored
Feb 26, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into refactor-commit-show
parents
2400c7bf
b5325655
Changes
125
Hide whitespace changes
Inline
Side-by-side
Showing
125 changed files
with
343 additions
and
379 deletions
+343
-379
app/assets/javascripts/boards/components/board_list.vue
app/assets/javascripts/boards/components/board_list.vue
+1
-1
app/assets/javascripts/boards/components/board_new_issue.vue
app/assets/javascripts/boards/components/board_new_issue.vue
+52
-39
app/assets/javascripts/boards/index.js
app/assets/javascripts/boards/index.js
+6
-4
app/assets/javascripts/boards/models/issue.js
app/assets/javascripts/boards/models/issue.js
+2
-0
app/assets/javascripts/boards/stores/boards_store.js
app/assets/javascripts/boards/stores/boards_store.js
+1
-1
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+70
-167
app/assets/javascripts/environments/components/environments_table.vue
...avascripts/environments/components/environments_table.vue
+1
-1
app/assets/javascripts/ide/components/repo_file.vue
app/assets/javascripts/ide/components/repo_file.vue
+3
-3
app/assets/javascripts/ide/components/repo_tab.vue
app/assets/javascripts/ide/components/repo_tab.vue
+1
-1
app/assets/javascripts/pages/admin/abuse_reports/index.js
app/assets/javascripts/pages/admin/abuse_reports/index.js
+1
-1
app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
...ripts/pages/admin/broadcast_messages/broadcast_message.js
+2
-2
app/assets/javascripts/pages/admin/broadcast_messages/index.js
...ssets/javascripts/pages/admin/broadcast_messages/index.js
+1
-1
app/assets/javascripts/pages/admin/cohorts/index.js
app/assets/javascripts/pages/admin/cohorts/index.js
+1
-1
app/assets/javascripts/pages/admin/groups/show/index.js
app/assets/javascripts/pages/admin/groups/show/index.js
+1
-1
app/assets/javascripts/pages/admin/labels/edit/index.js
app/assets/javascripts/pages/admin/labels/edit/index.js
+1
-1
app/assets/javascripts/pages/admin/labels/new/index.js
app/assets/javascripts/pages/admin/labels/new/index.js
+1
-1
app/assets/javascripts/pages/admin/projects/index.js
app/assets/javascripts/pages/admin/projects/index.js
+2
-2
app/assets/javascripts/pages/profiles/index/index.js
app/assets/javascripts/pages/profiles/index/index.js
+2
-2
app/assets/javascripts/pages/projects/compare/index.js
app/assets/javascripts/pages/projects/compare/index.js
+1
-3
app/assets/javascripts/pages/projects/index.js
app/assets/javascripts/pages/projects/index.js
+2
-2
app/assets/javascripts/pages/projects/new/index.js
app/assets/javascripts/pages/projects/new/index.js
+2
-2
app/assets/javascripts/pages/projects/wikis/index.js
app/assets/javascripts/pages/projects/wikis/index.js
+2
-2
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+3
-3
app/views/projects/services/prometheus/_configuration_banner.html.haml
...jects/services/prometheus/_configuration_banner.html.haml
+26
-0
app/views/projects/services/prometheus/_help.html.haml
app/views/projects/services/prometheus/_help.html.haml
+2
-26
changelogs/unreleased/43532-error-on-admin-applications-prometheus-template.yml
...43532-error-on-admin-applications-prometheus-template.yml
+5
-0
changelogs/unreleased/refactor-move-board-new-issue-vue-component.yml
...nreleased/refactor-move-board-new-issue-vue-component.yml
+5
-0
config/webpack.config.js
config/webpack.config.js
+3
-8
spec/features/admin/services/admin_activates_prometheus_spec.rb
...eatures/admin/services/admin_activates_prometheus_spec.rb
+21
-0
spec/features/projects/services/user_activates_prometheus_spec.rb
...tures/projects/services/user_activates_prometheus_spec.rb
+23
-0
spec/javascripts/boards/board_new_issue_spec.js
spec/javascripts/boards/board_new_issue_spec.js
+1
-1
spec/javascripts/ci_variable_list/ci_variable_list_spec.js
spec/javascripts/ci_variable_list/ci_variable_list_spec.js
+1
-1
spec/javascripts/clusters/clusters_bundle_spec.js
spec/javascripts/clusters/clusters_bundle_spec.js
+1
-1
spec/javascripts/clusters/components/application_row_spec.js
spec/javascripts/clusters/components/application_row_spec.js
+1
-1
spec/javascripts/clusters/components/applications_spec.js
spec/javascripts/clusters/components/applications_spec.js
+1
-1
spec/javascripts/commit/commit_pipeline_status_component_spec.js
...vascripts/commit/commit_pipeline_status_component_spec.js
+1
-1
spec/javascripts/cycle_analytics/banner_spec.js
spec/javascripts/cycle_analytics/banner_spec.js
+1
-1
spec/javascripts/cycle_analytics/total_time_component_spec.js
.../javascripts/cycle_analytics/total_time_component_spec.js
+1
-1
spec/javascripts/environments/emtpy_state_spec.js
spec/javascripts/environments/emtpy_state_spec.js
+1
-1
spec/javascripts/environments/environment_table_spec.js
spec/javascripts/environments/environment_table_spec.js
+1
-1
spec/javascripts/environments/environments_app_spec.js
spec/javascripts/environments/environments_app_spec.js
+2
-2
spec/javascripts/environments/folder/environments_folder_view_spec.js
...ipts/environments/folder/environments_folder_view_spec.js
+2
-2
spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
...cripts/feature_highlight/feature_highlight_helper_spec.js
+1
-1
spec/javascripts/groups/components/group_item_spec.js
spec/javascripts/groups/components/group_item_spec.js
+1
-2
spec/javascripts/groups/components/groups_spec.js
spec/javascripts/groups/components/groups_spec.js
+1
-2
spec/javascripts/groups/components/item_actions_spec.js
spec/javascripts/groups/components/item_actions_spec.js
+1
-2
spec/javascripts/groups/components/item_caret_spec.js
spec/javascripts/groups/components/item_caret_spec.js
+1
-1
spec/javascripts/groups/components/item_stats_spec.js
spec/javascripts/groups/components/item_stats_spec.js
+1
-2
spec/javascripts/groups/components/item_stats_value_spec.js
spec/javascripts/groups/components/item_stats_value_spec.js
+1
-1
spec/javascripts/groups/components/item_type_icon_spec.js
spec/javascripts/groups/components/item_type_icon_spec.js
+1
-2
spec/javascripts/issue_show/components/app_spec.js
spec/javascripts/issue_show/components/app_spec.js
+1
-1
spec/javascripts/issue_show/components/description_spec.js
spec/javascripts/issue_show/components/description_spec.js
+1
-1
spec/javascripts/jobs/header_spec.js
spec/javascripts/jobs/header_spec.js
+1
-1
spec/javascripts/pages/admin/jobs/index/components/stop_jobs_modal_spec.js
...pages/admin/jobs/index/components/stop_jobs_modal_spec.js
+1
-1
spec/javascripts/pages/milestones/shared/components/delete_milestone_modal_spec.js
...lestones/shared/components/delete_milestone_modal_spec.js
+1
-1
spec/javascripts/pipelines/graph/job_component_spec.js
spec/javascripts/pipelines/graph/job_component_spec.js
+1
-1
spec/javascripts/pipelines/pipelines_spec.js
spec/javascripts/pipelines/pipelines_spec.js
+1
-1
spec/javascripts/profile/account/components/delete_account_modal_spec.js
...s/profile/account/components/delete_account_modal_spec.js
+1
-1
spec/javascripts/projects_dropdown/components/app_spec.js
spec/javascripts/projects_dropdown/components/app_spec.js
+1
-1
spec/javascripts/projects_dropdown/components/projects_list_frequent_spec.js
...ojects_dropdown/components/projects_list_frequent_spec.js
+1
-1
spec/javascripts/projects_dropdown/components/projects_list_item_spec.js
...s/projects_dropdown/components/projects_list_item_spec.js
+1
-1
spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
...projects_dropdown/components/projects_list_search_spec.js
+1
-1
spec/javascripts/projects_dropdown/components/search_spec.js
spec/javascripts/projects_dropdown/components/search_spec.js
+1
-1
spec/javascripts/registry/components/app_spec.js
spec/javascripts/registry/components/app_spec.js
+1
-1
spec/javascripts/repo/components/commit_sidebar/list_collapsed_spec.js
...pts/repo/components/commit_sidebar/list_collapsed_spec.js
+1
-1
spec/javascripts/repo/components/commit_sidebar/list_item_spec.js
...ascripts/repo/components/commit_sidebar/list_item_spec.js
+1
-1
spec/javascripts/repo/components/commit_sidebar/list_spec.js
spec/javascripts/repo/components/commit_sidebar/list_spec.js
+1
-1
spec/javascripts/repo/components/ide_context_bar_spec.js
spec/javascripts/repo/components/ide_context_bar_spec.js
+1
-1
spec/javascripts/repo/components/ide_side_bar_spec.js
spec/javascripts/repo/components/ide_side_bar_spec.js
+1
-1
spec/javascripts/repo/components/ide_spec.js
spec/javascripts/repo/components/ide_spec.js
+1
-1
spec/javascripts/repo/components/new_branch_form_spec.js
spec/javascripts/repo/components/new_branch_form_spec.js
+1
-1
spec/javascripts/repo/components/new_dropdown/index_spec.js
spec/javascripts/repo/components/new_dropdown/index_spec.js
+1
-1
spec/javascripts/repo/components/new_dropdown/modal_spec.js
spec/javascripts/repo/components/new_dropdown/modal_spec.js
+1
-1
spec/javascripts/repo/components/new_dropdown/upload_spec.js
spec/javascripts/repo/components/new_dropdown/upload_spec.js
+1
-1
spec/javascripts/repo/components/repo_commit_section_spec.js
spec/javascripts/repo/components/repo_commit_section_spec.js
+1
-1
spec/javascripts/sidebar/lock/edit_form_buttons_spec.js
spec/javascripts/sidebar/lock/edit_form_buttons_spec.js
+1
-1
spec/javascripts/sidebar/participants_spec.js
spec/javascripts/sidebar/participants_spec.js
+1
-1
spec/javascripts/sidebar/sidebar_assignees_spec.js
spec/javascripts/sidebar/sidebar_assignees_spec.js
+1
-1
spec/javascripts/sidebar/sidebar_subscriptions_spec.js
spec/javascripts/sidebar/sidebar_subscriptions_spec.js
+1
-1
spec/javascripts/sidebar/subscriptions_spec.js
spec/javascripts/sidebar/subscriptions_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
...scripts/vue_mr_widget/components/mr_widget_author_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js
...ts/vue_mr_widget/components/mr_widget_author_time_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
...scripts/vue_mr_widget/components/mr_widget_header_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js
...pts/vue_mr_widget/components/mr_widget_merge_help_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
...ripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
...scripts/vue_mr_widget/components/mr_widget_rebase_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js
.../vue_mr_widget/components/mr_widget_related_links_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js
...ts/vue_mr_widget/components/mr_widget_status_icon_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_archived_spec.js
...ue_mr_widget/components/states/mr_widget_archived_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js
...get/components/states/mr_widget_auto_merge_failed_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_checking_spec.js
...ue_mr_widget/components/states/mr_widget_checking_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_closed_spec.js
.../vue_mr_widget/components/states/mr_widget_closed_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
...e_mr_widget/components/states/mr_widget_conflicts_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
...idget/components/states/mr_widget_failed_to_merge_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js
...nts/states/mr_widget_merge_when_pipeline_succeeds_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
.../vue_mr_widget/components/states/mr_widget_merged_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js
...vue_mr_widget/components/states/mr_widget_merging_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
...widget/components/states/mr_widget_missing_branch_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_not_allowed_spec.js
...mr_widget/components/states/mr_widget_not_allowed_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
...dget/components/states/mr_widget_pipeline_blocked_spec.js
+1
-1
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+1
-1
spec/javascripts/vue_shared/components/ci_badge_link_spec.js
spec/javascripts/vue_shared/components/ci_badge_link_spec.js
+1
-1
spec/javascripts/vue_shared/components/clipboard_button_spec.js
...avascripts/vue_shared/components/clipboard_button_spec.js
+1
-1
spec/javascripts/vue_shared/components/expand_button_spec.js
spec/javascripts/vue_shared/components/expand_button_spec.js
+1
-1
spec/javascripts/vue_shared/components/file_icon_spec.js
spec/javascripts/vue_shared/components/file_icon_spec.js
+1
-1
spec/javascripts/vue_shared/components/gl_modal_spec.js
spec/javascripts/vue_shared/components/gl_modal_spec.js
+1
-1
spec/javascripts/vue_shared/components/header_ci_component_spec.js
...scripts/vue_shared/components/header_ci_component_spec.js
+1
-1
spec/javascripts/vue_shared/components/icon_spec.js
spec/javascripts/vue_shared/components/icon_spec.js
+1
-1
spec/javascripts/vue_shared/components/issue/issue_warning_spec.js
...scripts/vue_shared/components/issue/issue_warning_spec.js
+1
-1
spec/javascripts/vue_shared/components/loading_button_spec.js
.../javascripts/vue_shared/components/loading_button_spec.js
+1
-1
spec/javascripts/vue_shared/components/modal_spec.js
spec/javascripts/vue_shared/components/modal_spec.js
+1
-1
spec/javascripts/vue_shared/components/navigation_tabs_spec.js
...javascripts/vue_shared/components/navigation_tabs_spec.js
+1
-1
spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js
...e_shared/components/notes/placeholder_system_note_spec.js
+1
-1
spec/javascripts/vue_shared/components/panel_resizer_spec.js
spec/javascripts/vue_shared/components/panel_resizer_spec.js
+1
-1
spec/javascripts/vue_shared/components/pikaday_spec.js
spec/javascripts/vue_shared/components/pikaday_spec.js
+1
-1
spec/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js
...shared/components/sidebar/collapsed_calendar_icon_spec.js
+1
-1
spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
.../components/sidebar/collapsed_grouped_date_picker_spec.js
+1
-1
spec/javascripts/vue_shared/components/sidebar/date_picker_spec.js
...scripts/vue_shared/components/sidebar/date_picker_spec.js
+1
-1
spec/javascripts/vue_shared/components/sidebar/toggle_sidebar_spec.js
...ipts/vue_shared/components/sidebar/toggle_sidebar_spec.js
+1
-1
spec/javascripts/vue_shared/components/skeleton_loading_container_spec.js
.../vue_shared/components/skeleton_loading_container_spec.js
+1
-1
spec/javascripts/vue_shared/components/stacked_progress_bar_spec.js
...cripts/vue_shared/components/stacked_progress_bar_spec.js
+1
-1
spec/javascripts/vue_shared/components/toggle_button_spec.js
spec/javascripts/vue_shared/components/toggle_button_spec.js
+1
-1
spec/javascripts/vue_shared/components/user_avatar/user_avatar_image_spec.js
...e_shared/components/user_avatar/user_avatar_image_spec.js
+1
-1
spec/requests/api/issues_spec.rb
spec/requests/api/issues_spec.rb
+2
-2
spec/requests/api/v3/issues_spec.rb
spec/requests/api/v3/issues_spec.rb
+2
-2
No files found.
app/assets/javascripts/boards/components/board_list.vue
View file @
9167989f
<
script
>
<
script
>
import
Sortable
from
'
vendor/Sortable
'
;
import
Sortable
from
'
vendor/Sortable
'
;
import
boardNewIssue
from
'
./board_new_issue
'
;
import
boardNewIssue
from
'
./board_new_issue
.vue
'
;
import
boardCard
from
'
./board_card.vue
'
;
import
boardCard
from
'
./board_card.vue
'
;
import
eventHub
from
'
../eventhub
'
;
import
eventHub
from
'
../eventhub
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
...
...
app/assets/javascripts/boards/components/board_new_issue.
js
→
app/assets/javascripts/boards/components/board_new_issue.
vue
View file @
9167989f
/* global ListIssue */
<
script
>
import
eventHub
from
'
../eventhub
'
;
import
eventHub
from
'
../eventhub
'
;
import
ListIssue
from
'
../models/issue
'
;
const
Store
=
gl
.
issueBoards
.
BoardsStore
;
const
Store
=
gl
.
issueBoards
.
BoardsStore
;
...
@@ -17,6 +18,9 @@ export default {
...
@@ -17,6 +18,9 @@ export default {
error
:
false
,
error
:
false
,
};
};
},
},
mounted
()
{
this
.
$refs
.
input
.
focus
();
},
methods
:
{
methods
:
{
submit
(
e
)
{
submit
(
e
)
{
e
.
preventDefault
();
e
.
preventDefault
();
...
@@ -59,42 +63,51 @@ export default {
...
@@ -59,42 +63,51 @@ export default {
eventHub
.
$emit
(
`hide-issue-form-
${
this
.
list
.
id
}
`
);
eventHub
.
$emit
(
`hide-issue-form-
${
this
.
list
.
id
}
`
);
},
},
},
},
mounted
()
{
this
.
$refs
.
input
.
focus
();
},
template
:
`
<div class="card board-new-issue-form">
<form @submit="submit($event)">
<div class="flash-container"
v-if="error">
<div class="flash-alert">
An error occurred. Please try again.
</div>
</div>
<label class="label-light"
:for="list.id + '-title'">
Title
</label>
<input class="form-control"
type="text"
v-model="title"
ref="input"
autocomplete="off"
:id="list.id + '-title'" />
<div class="clearfix prepend-top-10">
<button class="btn btn-success pull-left"
type="submit"
:disabled="title === ''"
ref="submit-button">
Submit issue
</button>
<button class="btn btn-default pull-right"
type="button"
@click="cancel">
Cancel
</button>
</div>
</form>
</div>
`
,
};
};
</
script
>
<
template
>
<div
class=
"card board-new-issue-form"
>
<form
@
submit=
"submit($event)"
>
<div
class=
"flash-container"
v-if=
"error"
>
<div
class=
"flash-alert"
>
An error occurred. Please try again.
</div>
</div>
<label
class=
"label-light"
:for=
"list.id + '-title'"
>
Title
</label>
<input
class=
"form-control"
type=
"text"
v-model=
"title"
ref=
"input"
autocomplete=
"off"
:id=
"list.id + '-title'"
/>
<div
class=
"clearfix prepend-top-10"
>
<button
class=
"btn btn-success pull-left"
type=
"submit"
:disabled=
"title === ''"
ref=
"submit-button"
>
Submit issue
</button>
<button
class=
"btn btn-default pull-right"
type=
"button"
@
click=
"cancel"
>
Cancel
</button>
</div>
</form>
</div>
</
template
>
app/assets/javascripts/boards/index.js
View file @
9167989f
...
@@ -2,11 +2,13 @@
...
@@ -2,11 +2,13 @@
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Flash
from
'
../flash
'
;
import
{
__
}
from
'
../locale
'
;
import
Flash
from
'
~/flash
'
;
import
{
__
}
from
'
~/locale
'
;
import
FilteredSearchBoards
from
'
./filtered_search_boards
'
;
import
FilteredSearchBoards
from
'
./filtered_search_boards
'
;
import
eventHub
from
'
./eventhub
'
;
import
eventHub
from
'
./eventhub
'
;
import
sidebarEventHub
from
'
../sidebar/event_hub
'
;
import
sidebarEventHub
from
'
~/sidebar/event_hub
'
;
// eslint-disable-line import/first
import
'
./models/issue
'
;
import
'
./models/issue
'
;
import
'
./models/label
'
;
import
'
./models/label
'
;
import
'
./models/list
'
;
import
'
./models/list
'
;
...
@@ -22,7 +24,7 @@ import './components/board';
...
@@ -22,7 +24,7 @@ import './components/board';
import
'
./components/board_sidebar
'
;
import
'
./components/board_sidebar
'
;
import
'
./components/new_list_dropdown
'
;
import
'
./components/new_list_dropdown
'
;
import
'
./components/modal/index
'
;
import
'
./components/modal/index
'
;
import
'
../vue_shared/vue_resource_interceptor
'
;
import
'
~/vue_shared/vue_resource_interceptor
'
;
// eslint-disable-line import/first
export
default
()
=>
{
export
default
()
=>
{
const
$boardApp
=
document
.
getElementById
(
'
board-app
'
);
const
$boardApp
=
document
.
getElementById
(
'
board-app
'
);
...
...
app/assets/javascripts/boards/models/issue.js
View file @
9167989f
...
@@ -110,3 +110,5 @@ class ListIssue {
...
@@ -110,3 +110,5 @@ class ListIssue {
}
}
window
.
ListIssue
=
ListIssue
;
window
.
ListIssue
=
ListIssue
;
export
default
ListIssue
;
app/assets/javascripts/boards/stores/boards_store.js
View file @
9167989f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
/* global List */
/* global List */
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
{
getUrlParamsArray
}
from
'
../..
/lib/utils/common_utils
'
;
import
{
getUrlParamsArray
}
from
'
~
/lib/utils/common_utils
'
;
window
.
gl
=
window
.
gl
||
{};
window
.
gl
=
window
.
gl
||
{};
window
.
gl
.
issueBoards
=
window
.
gl
.
issueBoards
||
{};
window
.
gl
.
issueBoards
=
window
.
gl
.
issueBoards
||
{};
...
...
app/assets/javascripts/dispatcher.js
View file @
9167989f
...
@@ -6,177 +6,80 @@ import GlFieldErrors from './gl_field_errors';
...
@@ -6,177 +6,80 @@ import GlFieldErrors from './gl_field_errors';
import
Shortcuts
from
'
./shortcuts
'
;
import
Shortcuts
from
'
./shortcuts
'
;
import
SearchAutocomplete
from
'
./search_autocomplete
'
;
import
SearchAutocomplete
from
'
./search_autocomplete
'
;
var
Dispatcher
;
function
initSearch
()
{
// Only when search form is present
(
function
()
{
if
(
$
(
'
.search
'
).
length
)
{
Dispatcher
=
(
function
()
{
return
new
SearchAutocomplete
();
function
Dispatcher
()
{
}
this
.
initSearch
();
}
this
.
initFieldErrors
();
this
.
initPageScripts
();
}
Dispatcher
.
prototype
.
initPageScripts
=
function
()
{
var
path
,
shortcut_handler
;
const
page
=
$
(
'
body
'
).
attr
(
'
data-page
'
);
if
(
!
page
)
{
return
false
;
}
const
fail
=
()
=>
Flash
(
'
Error loading dynamic module
'
);
const
callDefault
=
m
=>
m
.
default
();
path
=
page
.
split
(
'
:
'
);
shortcut_handler
=
null
;
$
(
'
.js-gfm-input:not(.js-vue-textarea)
'
).
each
((
i
,
el
)
=>
{
const
gfm
=
new
GfmAutoComplete
(
gl
.
GfmAutoComplete
&&
gl
.
GfmAutoComplete
.
dataSources
);
const
enableGFM
=
convertPermissionToBoolean
(
el
.
dataset
.
supportsAutocomplete
);
gfm
.
setup
(
$
(
el
),
{
emojis
:
true
,
members
:
enableGFM
,
issues
:
enableGFM
,
milestones
:
enableGFM
,
mergeRequests
:
enableGFM
,
labels
:
enableGFM
,
});
});
const
shortcutHandlerPages
=
[
'
projects:activity
'
,
'
projects:artifacts:browse
'
,
'
projects:artifacts:file
'
,
'
projects:blame:show
'
,
'
projects:blob:show
'
,
'
projects:commit:show
'
,
'
projects:commits:show
'
,
'
projects:find_file:show
'
,
'
projects:issues:edit
'
,
'
projects:issues:index
'
,
'
projects:issues:new
'
,
'
projects:issues:show
'
,
'
projects:merge_requests:creations:diffs
'
,
'
projects:merge_requests:creations:new
'
,
'
projects:merge_requests:edit
'
,
'
projects:merge_requests:index
'
,
'
projects:merge_requests:show
'
,
'
projects:network:show
'
,
'
projects:show
'
,
'
projects:tree:show
'
,
'
groups:show
'
,
];
if
(
shortcutHandlerPages
.
indexOf
(
page
)
!==
-
1
)
{
function
initFieldErrors
()
{
shortcut_handler
=
true
;
$
(
'
.gl-show-field-errors
'
).
each
((
i
,
form
)
=>
{
}
new
GlFieldErrors
(
form
);
});
}
switch
(
path
[
0
])
{
function
initPageShortcuts
(
page
)
{
case
'
admin
'
:
const
pagesWithCustomShortcuts
=
[
switch
(
path
[
1
])
{
'
projects:activity
'
,
case
'
broadcast_messages
'
:
'
projects:artifacts:browse
'
,
import
(
'
./pages/admin/broadcast_messages
'
)
'
projects:artifacts:file
'
,
.
then
(
callDefault
)
'
projects:blame:show
'
,
.
catch
(
fail
);
'
projects:blob:show
'
,
break
;
'
projects:commit:show
'
,
case
'
cohorts
'
:
'
projects:commits:show
'
,
import
(
'
./pages/admin/cohorts
'
)
'
projects:find_file:show
'
,
.
then
(
callDefault
)
'
projects:issues:edit
'
,
.
catch
(
fail
);
'
projects:issues:index
'
,
break
;
'
projects:issues:new
'
,
case
'
groups
'
:
'
projects:issues:show
'
,
switch
(
path
[
2
])
{
'
projects:merge_requests:creations:diffs
'
,
case
'
show
'
:
'
projects:merge_requests:creations:new
'
,
import
(
'
./pages/admin/groups/show
'
)
'
projects:merge_requests:edit
'
,
.
then
(
callDefault
)
'
projects:merge_requests:index
'
,
.
catch
(
fail
);
'
projects:merge_requests:show
'
,
break
;
'
projects:network:show
'
,
}
'
projects:show
'
,
break
;
'
projects:tree:show
'
,
case
'
projects
'
:
'
groups:show
'
,
import
(
'
./pages/admin/projects
'
)
];
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
labels
'
:
switch
(
path
[
2
])
{
case
'
new
'
:
import
(
'
./pages/admin/labels/new
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
edit
'
:
import
(
'
./pages/admin/labels/edit
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
}
case
'
abuse_reports
'
:
import
(
'
./pages/admin/abuse_reports
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
}
break
;
case
'
profiles
'
:
import
(
'
./pages/profiles/index
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
projects
'
:
import
(
'
./pages/projects
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
shortcut_handler
=
true
;
switch
(
path
[
1
])
{
case
'
compare
'
:
import
(
'
./pages/projects/compare
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
create
'
:
case
'
new
'
:
import
(
'
./pages/projects/new
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
wikis
'
:
import
(
'
./pages/projects/wikis
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
shortcut_handler
=
true
;
break
;
}
break
;
}
// If we haven't installed a custom shortcut handler, install the default one
if
(
!
shortcut_handler
)
{
new
Shortcuts
();
}
if
(
document
.
querySelector
(
'
#peek
'
))
{
if
(
pagesWithCustomShortcuts
.
indexOf
(
page
)
===
-
1
)
{
import
(
'
./performance_bar
'
)
new
Shortcuts
();
.
then
(
m
=>
new
m
.
default
({
container
:
'
#peek
'
}))
// eslint-disable-line new-cap
}
.
catch
(
fail
);
}
}
};
Dispatcher
.
prototype
.
initSearch
=
function
()
{
function
initGFMInput
()
{
// Only when search form is present
$
(
'
.js-gfm-input:not(.js-vue-textarea)
'
).
each
((
i
,
el
)
=>
{
if
(
$
(
'
.search
'
).
length
)
{
const
gfm
=
new
GfmAutoComplete
(
gl
.
GfmAutoComplete
&&
gl
.
GfmAutoComplete
.
dataSources
);
return
new
SearchAutocomplete
();
const
enableGFM
=
convertPermissionToBoolean
(
el
.
dataset
.
supportsAutocomplete
);
}
gfm
.
setup
(
$
(
el
),
{
};
emojis
:
true
,
members
:
enableGFM
,
issues
:
enableGFM
,
milestones
:
enableGFM
,
mergeRequests
:
enableGFM
,
labels
:
enableGFM
,
});
});
}
Dispatcher
.
prototype
.
initFieldErrors
=
function
()
{
function
initPerformanceBar
()
{
$
(
'
.gl-show-field-errors
'
).
each
((
i
,
form
)
=>
{
if
(
document
.
querySelector
(
'
#peek
'
))
{
new
GlFieldErrors
(
form
);
import
(
'
./performance_bar
'
)
});
.
then
(
m
=>
new
m
.
default
({
container
:
'
#peek
'
}))
// eslint-disable-line new-cap
};
.
catch
(()
=>
Flash
(
'
Error loading performance bar module
'
));
}
}
return
Dispatcher
;
export
default
()
=>
{
})
();
initSearch
();
})
();
initFieldErrors
();
export
default
function
initDispatcher
()
{
const
page
=
$
(
'
body
'
).
attr
(
'
data-page
'
);
return
new
Dispatcher
();
if
(
page
)
{
}
initPageShortcuts
(
page
);
initGFMInput
();
initPerformanceBar
();
}
};
app/assets/javascripts/environments/components/environments_table.vue
View file @
9167989f
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
/**
/**
* Render environments table.
* Render environments table.
*/
*/
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
environmentItem
from
'
./environment_item.vue
'
;
import
environmentItem
from
'
./environment_item.vue
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
...
app/assets/javascripts/ide/components/repo_file.vue
View file @
9167989f
<
script
>
<
script
>
import
{
mapState
}
from
'
vuex
'
;
import
{
mapState
}
from
'
vuex
'
;
import
timeAgoMixin
from
'
../../vue_shared/mixins/timeago
'
;
import
timeAgoMixin
from
'
~/vue_shared/mixins/timeago
'
;
import
skeletonLoadingContainer
from
'
../../vue_shared/components/skeleton_loading_container.vue
'
;
import
skeletonLoadingContainer
from
'
~/vue_shared/components/skeleton_loading_container.vue
'
;
import
fileIcon
from
'
~/vue_shared/components/file_icon.vue
'
;
import
newDropdown
from
'
./new_dropdown/index.vue
'
;
import
newDropdown
from
'
./new_dropdown/index.vue
'
;
import
fileIcon
from
'
../../vue_shared/components/file_icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
...
app/assets/javascripts/ide/components/repo_tab.vue
View file @
9167989f
<
script
>
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
fileIcon
from
'
../..
/vue_shared/components/file_icon.vue
'
;
import
fileIcon
from
'
~
/vue_shared/components/file_icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
...
app/assets/javascripts/pages/admin/abuse_reports/index.js
View file @
9167989f
import
AbuseReports
from
'
./abuse_reports
'
;
import
AbuseReports
from
'
./abuse_reports
'
;
export
default
()
=>
new
AbuseReports
(
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
AbuseReports
()
);
app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
View file @
9167989f
...
@@ -3,7 +3,7 @@ import axios from '~/lib/utils/axios_utils';
...
@@ -3,7 +3,7 @@ import axios from '~/lib/utils/axios_utils';
import
flash
from
'
~/flash
'
;
import
flash
from
'
~/flash
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
export
default
function
initBroadcastMessagesForm
()
{
export
default
()
=>
{
$
(
'
input#broadcast_message_color
'
).
on
(
'
input
'
,
function
onMessageColorInput
()
{
$
(
'
input#broadcast_message_color
'
).
on
(
'
input
'
,
function
onMessageColorInput
()
{
const
previewColor
=
$
(
this
).
val
();
const
previewColor
=
$
(
this
).
val
();
$
(
'
div.broadcast-message-preview
'
).
css
(
'
background-color
'
,
previewColor
);
$
(
'
div.broadcast-message-preview
'
).
css
(
'
background-color
'
,
previewColor
);
...
@@ -32,4 +32,4 @@ export default function initBroadcastMessagesForm() {
...
@@ -32,4 +32,4 @@ export default function initBroadcastMessagesForm() {
.
catch
(()
=>
flash
(
__
(
'
An error occurred while rendering preview broadcast message
'
)));
.
catch
(()
=>
flash
(
__
(
'
An error occurred while rendering preview broadcast message
'
)));
}
}
},
250
));
},
250
));
}
}
;
app/assets/javascripts/pages/admin/broadcast_messages/index.js
View file @
9167989f
import
initBroadcastMessagesForm
from
'
./broadcast_message
'
;
import
initBroadcastMessagesForm
from
'
./broadcast_message
'
;
export
default
()
=>
initBroadcastMessagesForm
(
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initBroadcastMessagesForm
);
app/assets/javascripts/pages/admin/cohorts/index.js
View file @
9167989f
import
initUsagePing
from
'
./usage_ping
'
;
import
initUsagePing
from
'
./usage_ping
'
;
export
default
()
=>
initUsagePing
(
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initUsagePing
);
app/assets/javascripts/pages/admin/groups/show/index.js
View file @
9167989f
import
UsersSelect
from
'
../../../../users_select
'
;
import
UsersSelect
from
'
../../../../users_select
'
;
export
default
()
=>
new
UsersSelect
(
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
UsersSelect
()
);
app/assets/javascripts/pages/admin/labels/edit/index.js
View file @
9167989f
import
Labels
from
'
../../../../labels
'
;
import
Labels
from
'
../../../../labels
'
;
export
default
()
=>
new
Labels
(
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Labels
()
);
app/assets/javascripts/pages/admin/labels/new/index.js
View file @
9167989f
import
Labels
from
'
../../../../labels
'
;
import
Labels
from
'
../../../../labels
'
;
export
default
()
=>
new
Labels
(
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Labels
()
);
app/assets/javascripts/pages/admin/projects/index.js
View file @
9167989f
import
ProjectsList
from
'
../../../projects_list
'
;
import
ProjectsList
from
'
../../../projects_list
'
;
import
NamespaceSelect
from
'
../../../namespace_select
'
;
import
NamespaceSelect
from
'
../../../namespace_select
'
;
export
default
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
ProjectsList
();
// eslint-disable-line no-new
new
ProjectsList
();
// eslint-disable-line no-new
document
.
querySelectorAll
(
'
.js-namespace-select
'
)
document
.
querySelectorAll
(
'
.js-namespace-select
'
)
.
forEach
(
dropdown
=>
new
NamespaceSelect
({
dropdown
}));
.
forEach
(
dropdown
=>
new
NamespaceSelect
({
dropdown
}));
};
}
)
;
app/assets/javascripts/pages/profiles/index/index.js
View file @
9167989f
import
NotificationsForm
from
'
../../../notifications_form
'
;
import
NotificationsForm
from
'
../../../notifications_form
'
;
import
notificationsDropdown
from
'
../../../notifications_dropdown
'
;
import
notificationsDropdown
from
'
../../../notifications_dropdown
'
;
export
default
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
NotificationsForm
();
// eslint-disable-line no-new
new
NotificationsForm
();
// eslint-disable-line no-new
notificationsDropdown
();
notificationsDropdown
();
};
}
)
;
app/assets/javascripts/pages/projects/compare/index.js
View file @
9167989f
import
initCompareAutocomplete
from
'
~/compare_autocomplete
'
;
import
initCompareAutocomplete
from
'
~/compare_autocomplete
'
;
export
default
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initCompareAutocomplete
);
initCompareAutocomplete
();
};
app/assets/javascripts/pages/projects/index.js
View file @
9167989f
import
Project
from
'
./project
'
;
import
Project
from
'
./project
'
;
import
ShortcutsNavigation
from
'
../../shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
../../shortcuts_navigation
'
;
export
default
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
Project
();
// eslint-disable-line no-new
new
Project
();
// eslint-disable-line no-new
new
ShortcutsNavigation
();
// eslint-disable-line no-new
new
ShortcutsNavigation
();
// eslint-disable-line no-new
};
}
)
;
app/assets/javascripts/pages/projects/new/index.js
View file @
9167989f
...
@@ -2,8 +2,8 @@ import ProjectNew from '../shared/project_new';
...
@@ -2,8 +2,8 @@ import ProjectNew from '../shared/project_new';
import
initProjectVisibilitySelector
from
'
../../../project_visibility
'
;
import
initProjectVisibilitySelector
from
'
../../../project_visibility
'
;
import
initProjectNew
from
'
../../../projects/project_new
'
;
import
initProjectNew
from
'
../../../projects/project_new
'
;
export
default
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
ProjectNew
();
// eslint-disable-line no-new
new
ProjectNew
();
// eslint-disable-line no-new
initProjectVisibilitySelector
();
initProjectVisibilitySelector
();
initProjectNew
.
bindEvents
();
initProjectNew
.
bindEvents
();
};
}
)
;
app/assets/javascripts/pages/projects/wikis/index.js
View file @
9167989f
...
@@ -3,9 +3,9 @@ import ShortcutsWiki from '../../../shortcuts_wiki';
...
@@ -3,9 +3,9 @@ import ShortcutsWiki from '../../../shortcuts_wiki';
import
ZenMode
from
'
../../../zen_mode
'
;
import
ZenMode
from
'
../../../zen_mode
'
;
import
GLForm
from
'
../../../gl_form
'
;
import
GLForm
from
'
../../../gl_form
'
;
export
default
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
Wikis
();
// eslint-disable-line no-new
new
Wikis
();
// eslint-disable-line no-new
new
ShortcutsWiki
();
// eslint-disable-line no-new
new
ShortcutsWiki
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
new
GLForm
(
$
(
'
.wiki-form
'
),
true
);
// eslint-disable-line no-new
new
GLForm
(
$
(
'
.wiki-form
'
),
true
);
// eslint-disable-line no-new
};
}
)
;
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
9167989f
<
script
>
<
script
>
/* eslint-disable vue/require-default-prop */
/* eslint-disable vue/require-default-prop */
import
pipelineStage
from
'
../..
/pipelines/components/stage.vue
'
;
import
pipelineStage
from
'
~
/pipelines/components/stage.vue
'
;
import
ciIcon
from
'
../..
/vue_shared/components/ci_icon.vue
'
;
import
ciIcon
from
'
~
/vue_shared/components/ci_icon.vue
'
;
import
icon
from
'
../..
/vue_shared/components/icon.vue
'
;
import
icon
from
'
~
/vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
name
:
'
MRWidgetPipeline
'
,
name
:
'
MRWidgetPipeline
'
,
...
...
app/views/projects/services/prometheus/_configuration_banner.html.haml
0 → 100644
View file @
9167989f
%h4
=
s_
(
'PrometheusService|Auto configuration'
)
-
if
service
.
manual_configuration?
.well
=
s_
(
'PrometheusService|To enable the installation of Prometheus on your clusters, deactivate the manual configuration below'
)
-
else
.container-fluid
.row
-
if
service
.
prometheus_installed?
.col-sm-2
.svg-container
=
image_tag
'illustrations/monitoring/getting_started.svg'
.col-sm-10
%p
.text-success.prepend-top-default
=
s_
(
'PrometheusService|Prometheus is being automatically managed on your clusters'
)
=
link_to
s_
(
'PrometheusService|Manage clusters'
),
project_clusters_path
(
project
),
class:
'btn'
-
else
.col-sm-2
=
image_tag
'illustrations/monitoring/loading.svg'
.col-sm-10
%p
.prepend-top-default
=
s_
(
'PrometheusService|Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments'
)
=
link_to
s_
(
'PrometheusService|Install Prometheus on clusters'
),
project_clusters_path
(
project
),
class:
'btn btn-success'
%hr
app/views/projects/services/prometheus/_help.html.haml
View file @
9167989f
%h4
-
if
@project
=
s_
(
'PrometheusService|Auto configuration'
)
=
render
'projects/services/prometheus/configuration_banner'
,
project:
@project
,
service:
@service
-
if
@service
.
manual_configuration?
.well
=
s_
(
'PrometheusService|To enable the installation of Prometheus on your clusters, deactivate the manual configuration below'
)
-
else
.container-fluid
.row
-
if
@service
.
prometheus_installed?
.col-sm-2
.svg-container
=
image_tag
'illustrations/monitoring/getting_started.svg'
.col-sm-10
%p
.text-success.prepend-top-default
=
s_
(
'PrometheusService|Prometheus is being automatically managed on your clusters'
)
=
link_to
s_
(
'PrometheusService|Manage clusters'
),
project_clusters_path
(
@project
),
class:
'btn'
-
else
.col-sm-2
=
image_tag
'illustrations/monitoring/loading.svg'
.col-sm-10
%p
.prepend-top-default
=
s_
(
'PrometheusService|Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments'
)
=
link_to
s_
(
'PrometheusService|Install Prometheus on clusters'
),
project_clusters_path
(
@project
),
class:
'btn btn-success'
%hr
%h4
.append-bottom-default
%h4
.append-bottom-default
=
s_
(
'PrometheusService|Manual configuration'
)
=
s_
(
'PrometheusService|Manual configuration'
)
...
...
changelogs/unreleased/43532-error-on-admin-applications-prometheus-template.yml
0 → 100644
View file @
9167989f
---
title
:
Fixes Prometheus admin configuration page
merge_request
:
17377
author
:
type
:
fixed
changelogs/unreleased/refactor-move-board-new-issue-vue-component.yml
0 → 100644
View file @
9167989f
---
title
:
Move BoardNewIssue vue component
merge_request
:
16947
author
:
George Tsiolis
type
:
performance
config/webpack.config.js
View file @
9167989f
...
@@ -25,16 +25,10 @@ var NO_COMPRESSION = process.env.NO_COMPRESSION;
...
@@ -25,16 +25,10 @@ var NO_COMPRESSION = process.env.NO_COMPRESSION;
var
autoEntries
=
{};
var
autoEntries
=
{};
var
pageEntries
=
glob
.
sync
(
'
pages/**/index.js
'
,
{
cwd
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
)
});
var
pageEntries
=
glob
.
sync
(
'
pages/**/index.js
'
,
{
cwd
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
)
});
// filter out entries currently imported dynamically in dispatcher.js
var
dispatcher
=
fs
.
readFileSync
(
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts/dispatcher.js
'
)).
toString
();
var
dispatcherChunks
=
dispatcher
.
match
(
/
(?!
import
\(
'
)\.\/
pages
\/[^
'
]
+/g
);
function
generateAutoEntries
(
path
,
prefix
=
'
.
'
)
{
function
generateAutoEntries
(
path
,
prefix
=
'
.
'
)
{
const
chunkPath
=
path
.
replace
(
/
\/
index
\.
js$/
,
''
);
const
chunkPath
=
path
.
replace
(
/
\/
index
\.
js$/
,
''
);
if
(
!
dispatcherChunks
.
includes
(
`
${
prefix
}
/
${
chunkPath
}
`
))
{
const
chunkName
=
chunkPath
.
replace
(
/
\/
/g
,
'
.
'
);
const
chunkName
=
chunkPath
.
replace
(
/
\/
/g
,
'
.
'
);
autoEntries
[
chunkName
]
=
`
${
prefix
}
/
${
path
}
`
;
autoEntries
[
chunkName
]
=
`
${
prefix
}
/
${
path
}
`
;
}
}
}
pageEntries
.
forEach
((
path
)
=>
generateAutoEntries
(
path
));
pageEntries
.
forEach
((
path
)
=>
generateAutoEntries
(
path
));
...
@@ -307,6 +301,7 @@ var config = {
...
@@ -307,6 +301,7 @@ var config = {
'
images
'
:
path
.
join
(
ROOT_PATH
,
'
app/assets/images
'
),
'
images
'
:
path
.
join
(
ROOT_PATH
,
'
app/assets/images
'
),
'
vendor
'
:
path
.
join
(
ROOT_PATH
,
'
vendor/assets/javascripts
'
),
'
vendor
'
:
path
.
join
(
ROOT_PATH
,
'
vendor/assets/javascripts
'
),
'
vue$
'
:
'
vue/dist/vue.esm.js
'
,
'
vue$
'
:
'
vue/dist/vue.esm.js
'
,
'
spec
'
:
path
.
join
(
ROOT_PATH
,
'
spec/javascripts
'
),
}
}
}
}
}
}
...
...
spec/features/admin/services/admin_activates_prometheus_spec.rb
0 → 100644
View file @
9167989f
require
'spec_helper'
describe
'Admin activates Prometheus'
do
let
(
:admin
)
{
create
(
:user
,
:admin
)
}
before
do
sign_in
(
admin
)
visit
(
admin_application_settings_services_path
)
click_link
(
'Prometheus'
)
end
it
'activates service'
do
check
(
'Active'
)
fill_in
(
'API URL'
,
with:
'http://prometheus.example.com'
)
click_button
(
'Save'
)
expect
(
page
).
to
have_content
(
'Application settings saved successfully'
)
end
end
spec/features/projects/services/user_activates_prometheus_spec.rb
0 → 100644
View file @
9167989f
require
'spec_helper'
describe
'User activates Prometheus'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
add_master
(
user
)
sign_in
(
user
)
visit
(
project_settings_integrations_path
(
project
))
click_link
(
'Prometheus'
)
end
it
'activates service'
do
check
(
'Active'
)
fill_in
(
'API URL'
,
with:
'http://prometheus.example.com'
)
click_button
(
'Save changes'
)
expect
(
page
).
to
have_content
(
'Prometheus activated.'
)
end
end
spec/javascripts/boards/board_new_issue_spec.js
View file @
9167989f
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
boardNewIssue
from
'
~/boards/components/board_new_issue
'
;
import
boardNewIssue
from
'
~/boards/components/board_new_issue
.vue
'
;
import
'
~/boards/models/list
'
;
import
'
~/boards/models/list
'
;
import
{
listObj
,
boardsMockInterceptor
,
mockBoardService
}
from
'
./mock_data
'
;
import
{
listObj
,
boardsMockInterceptor
,
mockBoardService
}
from
'
./mock_data
'
;
...
...
spec/javascripts/ci_variable_list/ci_variable_list_spec.js
View file @
9167989f
import
VariableList
from
'
~/ci_variable_list/ci_variable_list
'
;
import
VariableList
from
'
~/ci_variable_list/ci_variable_list
'
;
import
getSetTimeoutPromise
from
'
..
/helpers/set_timeout_promise_helper
'
;
import
getSetTimeoutPromise
from
'
spec
/helpers/set_timeout_promise_helper
'
;
const
HIDE_CLASS
=
'
hide
'
;
const
HIDE_CLASS
=
'
hide
'
;
...
...
spec/javascripts/clusters/clusters_bundle_spec.js
View file @
9167989f
...
@@ -7,7 +7,7 @@ import {
...
@@ -7,7 +7,7 @@ import {
REQUEST_SUCCESS
,
REQUEST_SUCCESS
,
REQUEST_FAILURE
,
REQUEST_FAILURE
,
}
from
'
~/clusters/constants
'
;
}
from
'
~/clusters/constants
'
;
import
getSetTimeoutPromise
from
'
..
/helpers/set_timeout_promise_helper
'
;
import
getSetTimeoutPromise
from
'
spec
/helpers/set_timeout_promise_helper
'
;
describe
(
'
Clusters
'
,
()
=>
{
describe
(
'
Clusters
'
,
()
=>
{
let
cluster
;
let
cluster
;
...
...
spec/javascripts/clusters/components/application_row_spec.js
View file @
9167989f
...
@@ -12,7 +12,7 @@ import {
...
@@ -12,7 +12,7 @@ import {
REQUEST_FAILURE
,
REQUEST_FAILURE
,
}
from
'
~/clusters/constants
'
;
}
from
'
~/clusters/constants
'
;
import
applicationRow
from
'
~/clusters/components/application_row.vue
'
;
import
applicationRow
from
'
~/clusters/components/application_row.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
DEFAULT_APPLICATION_STATE
}
from
'
../services/mock_data
'
;
import
{
DEFAULT_APPLICATION_STATE
}
from
'
../services/mock_data
'
;
describe
(
'
Application Row
'
,
()
=>
{
describe
(
'
Application Row
'
,
()
=>
{
...
...
spec/javascripts/clusters/components/applications_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
applications
from
'
~/clusters/components/applications.vue
'
;
import
applications
from
'
~/clusters/components/applications.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Applications
'
,
()
=>
{
describe
(
'
Applications
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/commit/commit_pipeline_status_component_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
commitPipelineStatus
from
'
~/projects/tree/components/commit_pipeline_status_component.vue
'
;
import
commitPipelineStatus
from
'
~/projects/tree/components/commit_pipeline_status_component.vue
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Commit pipeline status component
'
,
()
=>
{
describe
(
'
Commit pipeline status component
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/cycle_analytics/banner_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
banner
from
'
~/cycle_analytics/components/banner.vue
'
;
import
banner
from
'
~/cycle_analytics/components/banner.vue
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Cycle analytics banner
'
,
()
=>
{
describe
(
'
Cycle analytics banner
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/cycle_analytics/total_time_component_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
component
from
'
~/cycle_analytics/components/total_time_component.vue
'
;
import
component
from
'
~/cycle_analytics/components/total_time_component.vue
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Total time component
'
,
()
=>
{
describe
(
'
Total time component
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/environments/emtpy_state_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
emptyState
from
'
~/environments/components/empty_state.vue
'
;
import
emptyState
from
'
~/environments/components/empty_state.vue
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
environments empty state
'
,
()
=>
{
describe
(
'
environments empty state
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/environments/environment_table_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
environmentTableComp
from
'
~/environments/components/environments_table.vue
'
;
import
environmentTableComp
from
'
~/environments/components/environments_table.vue
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Environment table
'
,
()
=>
{
describe
(
'
Environment table
'
,
()
=>
{
let
Component
;
let
Component
;
...
...
spec/javascripts/environments/environments_app_spec.js
View file @
9167989f
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
environmentsComponent
from
'
~/environments/components/environments_app.vue
'
;
import
environmentsComponent
from
'
~/environments/components/environments_app.vue
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
headersInterceptor
}
from
'
spec/helpers/vue_resource_helper
'
;
import
{
environment
,
folder
}
from
'
./mock_data
'
;
import
{
environment
,
folder
}
from
'
./mock_data
'
;
import
{
headersInterceptor
}
from
'
../helpers/vue_resource_helper
'
;
import
mountComponent
from
'
../helpers/vue_mount_component_helper
'
;
describe
(
'
Environment
'
,
()
=>
{
describe
(
'
Environment
'
,
()
=>
{
const
mockData
=
{
const
mockData
=
{
...
...
spec/javascripts/environments/folder/environments_folder_view_spec.js
View file @
9167989f
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
environmentsFolderViewComponent
from
'
~/environments/folder/environments_folder_view.vue
'
;
import
environmentsFolderViewComponent
from
'
~/environments/folder/environments_folder_view.vue
'
;
import
{
headersInterceptor
}
from
'
spec/helpers/vue_resource_helper
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
environmentsList
}
from
'
../mock_data
'
;
import
{
environmentsList
}
from
'
../mock_data
'
;
import
{
headersInterceptor
}
from
'
../../helpers/vue_resource_helper
'
;
import
mountComponent
from
'
../../helpers/vue_mount_component_helper
'
;
describe
(
'
Environments Folder View
'
,
()
=>
{
describe
(
'
Environments Folder View
'
,
()
=>
{
let
Component
;
let
Component
;
...
...
spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
View file @
9167989f
...
@@ -8,7 +8,7 @@ import {
...
@@ -8,7 +8,7 @@ import {
mouseenter
,
mouseenter
,
inserted
,
inserted
,
}
from
'
~/feature_highlight/feature_highlight_helper
'
;
}
from
'
~/feature_highlight/feature_highlight_helper
'
;
import
getSetTimeoutPromise
from
'
..
/helpers/set_timeout_promise_helper
'
;
import
getSetTimeoutPromise
from
'
spec
/helpers/set_timeout_promise_helper
'
;
describe
(
'
feature highlight helper
'
,
()
=>
{
describe
(
'
feature highlight helper
'
,
()
=>
{
describe
(
'
getSelector
'
,
()
=>
{
describe
(
'
getSelector
'
,
()
=>
{
...
...
spec/javascripts/groups/components/group_item_spec.js
View file @
9167989f
...
@@ -3,10 +3,9 @@ import * as urlUtils from '~/lib/utils/url_utility';
...
@@ -3,10 +3,9 @@ import * as urlUtils from '~/lib/utils/url_utility';
import
groupItemComponent
from
'
~/groups/components/group_item.vue
'
;
import
groupItemComponent
from
'
~/groups/components/group_item.vue
'
;
import
groupFolderComponent
from
'
~/groups/components/group_folder.vue
'
;
import
groupFolderComponent
from
'
~/groups/components/group_folder.vue
'
;
import
eventHub
from
'
~/groups/event_hub
'
;
import
eventHub
from
'
~/groups/event_hub
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
mockParentGroupItem
,
mockChildren
}
from
'
../mock_data
'
;
import
{
mockParentGroupItem
,
mockChildren
}
from
'
../mock_data
'
;
import
mountComponent
from
'
../../helpers/vue_mount_component_helper
'
;
const
createComponent
=
(
group
=
mockParentGroupItem
,
parentGroup
=
mockChildren
[
0
])
=>
{
const
createComponent
=
(
group
=
mockParentGroupItem
,
parentGroup
=
mockChildren
[
0
])
=>
{
const
Component
=
Vue
.
extend
(
groupItemComponent
);
const
Component
=
Vue
.
extend
(
groupItemComponent
);
...
...
spec/javascripts/groups/components/groups_spec.js
View file @
9167989f
...
@@ -4,10 +4,9 @@ import groupsComponent from '~/groups/components/groups.vue';
...
@@ -4,10 +4,9 @@ import groupsComponent from '~/groups/components/groups.vue';
import
groupFolderComponent
from
'
~/groups/components/group_folder.vue
'
;
import
groupFolderComponent
from
'
~/groups/components/group_folder.vue
'
;
import
groupItemComponent
from
'
~/groups/components/group_item.vue
'
;
import
groupItemComponent
from
'
~/groups/components/group_item.vue
'
;
import
eventHub
from
'
~/groups/event_hub
'
;
import
eventHub
from
'
~/groups/event_hub
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
mockGroups
,
mockPageInfo
}
from
'
../mock_data
'
;
import
{
mockGroups
,
mockPageInfo
}
from
'
../mock_data
'
;
import
mountComponent
from
'
../../helpers/vue_mount_component_helper
'
;
const
createComponent
=
(
searchEmpty
=
false
)
=>
{
const
createComponent
=
(
searchEmpty
=
false
)
=>
{
const
Component
=
Vue
.
extend
(
groupsComponent
);
const
Component
=
Vue
.
extend
(
groupsComponent
);
...
...
spec/javascripts/groups/components/item_actions_spec.js
View file @
9167989f
...
@@ -2,10 +2,9 @@ import Vue from 'vue';
...
@@ -2,10 +2,9 @@ import Vue from 'vue';
import
itemActionsComponent
from
'
~/groups/components/item_actions.vue
'
;
import
itemActionsComponent
from
'
~/groups/components/item_actions.vue
'
;
import
eventHub
from
'
~/groups/event_hub
'
;
import
eventHub
from
'
~/groups/event_hub
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
mockParentGroupItem
,
mockChildren
}
from
'
../mock_data
'
;
import
{
mockParentGroupItem
,
mockChildren
}
from
'
../mock_data
'
;
import
mountComponent
from
'
../../helpers/vue_mount_component_helper
'
;
const
createComponent
=
(
group
=
mockParentGroupItem
,
parentGroup
=
mockChildren
[
0
])
=>
{
const
createComponent
=
(
group
=
mockParentGroupItem
,
parentGroup
=
mockChildren
[
0
])
=>
{
const
Component
=
Vue
.
extend
(
itemActionsComponent
);
const
Component
=
Vue
.
extend
(
itemActionsComponent
);
...
...
spec/javascripts/groups/components/item_caret_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
itemCaretComponent
from
'
~/groups/components/item_caret.vue
'
;
import
itemCaretComponent
from
'
~/groups/components/item_caret.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
createComponent
=
(
isGroupOpen
=
false
)
=>
{
const
createComponent
=
(
isGroupOpen
=
false
)
=>
{
const
Component
=
Vue
.
extend
(
itemCaretComponent
);
const
Component
=
Vue
.
extend
(
itemCaretComponent
);
...
...
spec/javascripts/groups/components/item_stats_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
itemStatsComponent
from
'
~/groups/components/item_stats.vue
'
;
import
itemStatsComponent
from
'
~/groups/components/item_stats.vue
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
import
{
mockParentGroupItem
,
mockParentGroupItem
,
ITEM_TYPE
,
ITEM_TYPE
,
...
@@ -9,8 +10,6 @@ import {
...
@@ -9,8 +10,6 @@ import {
PROJECT_VISIBILITY_TYPE
,
PROJECT_VISIBILITY_TYPE
,
}
from
'
../mock_data
'
;
}
from
'
../mock_data
'
;
import
mountComponent
from
'
../../helpers/vue_mount_component_helper
'
;
const
createComponent
=
(
item
=
mockParentGroupItem
)
=>
{
const
createComponent
=
(
item
=
mockParentGroupItem
)
=>
{
const
Component
=
Vue
.
extend
(
itemStatsComponent
);
const
Component
=
Vue
.
extend
(
itemStatsComponent
);
...
...
spec/javascripts/groups/components/item_stats_value_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
itemStatsValueComponent
from
'
~/groups/components/item_stats_value.vue
'
;
import
itemStatsValueComponent
from
'
~/groups/components/item_stats_value.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
createComponent
=
({
title
,
cssClass
,
iconName
,
tooltipPlacement
,
value
})
=>
{
const
createComponent
=
({
title
,
cssClass
,
iconName
,
tooltipPlacement
,
value
})
=>
{
const
Component
=
Vue
.
extend
(
itemStatsValueComponent
);
const
Component
=
Vue
.
extend
(
itemStatsValueComponent
);
...
...
spec/javascripts/groups/components/item_type_icon_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
itemTypeIconComponent
from
'
~/groups/components/item_type_icon.vue
'
;
import
itemTypeIconComponent
from
'
~/groups/components/item_type_icon.vue
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
ITEM_TYPE
}
from
'
../mock_data
'
;
import
{
ITEM_TYPE
}
from
'
../mock_data
'
;
import
mountComponent
from
'
../../helpers/vue_mount_component_helper
'
;
const
createComponent
=
(
itemType
=
ITEM_TYPE
.
GROUP
,
isGroupOpen
=
false
)
=>
{
const
createComponent
=
(
itemType
=
ITEM_TYPE
.
GROUP
,
isGroupOpen
=
false
)
=>
{
const
Component
=
Vue
.
extend
(
itemTypeIconComponent
);
const
Component
=
Vue
.
extend
(
itemTypeIconComponent
);
...
...
spec/javascripts/issue_show/components/app_spec.js
View file @
9167989f
...
@@ -6,8 +6,8 @@ import '~/render_gfm';
...
@@ -6,8 +6,8 @@ import '~/render_gfm';
import
*
as
urlUtils
from
'
~/lib/utils/url_utility
'
;
import
*
as
urlUtils
from
'
~/lib/utils/url_utility
'
;
import
issuableApp
from
'
~/issue_show/components/app.vue
'
;
import
issuableApp
from
'
~/issue_show/components/app.vue
'
;
import
eventHub
from
'
~/issue_show/event_hub
'
;
import
eventHub
from
'
~/issue_show/event_hub
'
;
import
setTimeoutPromise
from
'
spec/helpers/set_timeout_promise_helper
'
;
import
issueShowData
from
'
../mock_data
'
;
import
issueShowData
from
'
../mock_data
'
;
import
setTimeoutPromise
from
'
../../helpers/set_timeout_promise_helper
'
;
function
formatText
(
text
)
{
function
formatText
(
text
)
{
return
text
.
trim
().
replace
(
/
\s\s
+/g
,
'
'
);
return
text
.
trim
().
replace
(
/
\s\s
+/g
,
'
'
);
...
...
spec/javascripts/issue_show/components/description_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
descriptionComponent
from
'
~/issue_show/components/description.vue
'
;
import
descriptionComponent
from
'
~/issue_show/components/description.vue
'
;
import
*
as
taskList
from
'
~/task_list
'
;
import
*
as
taskList
from
'
~/task_list
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Description component
'
,
()
=>
{
describe
(
'
Description component
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/jobs/header_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
headerComponent
from
'
~/jobs/components/header.vue
'
;
import
headerComponent
from
'
~/jobs/components/header.vue
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Job details header
'
,
()
=>
{
describe
(
'
Job details header
'
,
()
=>
{
let
HeaderComponent
;
let
HeaderComponent
;
...
...
spec/javascripts/pages/admin/jobs/index/components/stop_jobs_modal_spec.js
View file @
9167989f
...
@@ -4,7 +4,7 @@ import axios from '~/lib/utils/axios_utils';
...
@@ -4,7 +4,7 @@ import axios from '~/lib/utils/axios_utils';
import
stopJobsModal
from
'
~/pages/admin/jobs/index/components/stop_jobs_modal.vue
'
;
import
stopJobsModal
from
'
~/pages/admin/jobs/index/components/stop_jobs_modal.vue
'
;
import
*
as
urlUtility
from
'
~/lib/utils/url_utility
'
;
import
*
as
urlUtility
from
'
~/lib/utils/url_utility
'
;
import
mountComponent
from
'
../../../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
stop_jobs_modal.vue
'
,
()
=>
{
describe
(
'
stop_jobs_modal.vue
'
,
()
=>
{
const
props
=
{
const
props
=
{
...
...
spec/javascripts/pages/milestones/shared/components/delete_milestone_modal_spec.js
View file @
9167989f
...
@@ -5,7 +5,7 @@ import deleteMilestoneModal from '~/pages/milestones/shared/components/delete_mi
...
@@ -5,7 +5,7 @@ import deleteMilestoneModal from '~/pages/milestones/shared/components/delete_mi
import
eventHub
from
'
~/pages/milestones/shared/event_hub
'
;
import
eventHub
from
'
~/pages/milestones/shared/event_hub
'
;
import
*
as
urlUtility
from
'
~/lib/utils/url_utility
'
;
import
*
as
urlUtility
from
'
~/lib/utils/url_utility
'
;
import
mountComponent
from
'
../../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
delete_milestone_modal.vue
'
,
()
=>
{
describe
(
'
delete_milestone_modal.vue
'
,
()
=>
{
const
Component
=
Vue
.
extend
(
deleteMilestoneModal
);
const
Component
=
Vue
.
extend
(
deleteMilestoneModal
);
...
...
spec/javascripts/pipelines/graph/job_component_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
jobComponent
from
'
~/pipelines/components/graph/job_component.vue
'
;
import
jobComponent
from
'
~/pipelines/components/graph/job_component.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
pipeline graph job component
'
,
()
=>
{
describe
(
'
pipeline graph job component
'
,
()
=>
{
let
JobComponent
;
let
JobComponent
;
...
...
spec/javascripts/pipelines/pipelines_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import _ from 'underscore';
...
@@ -2,7 +2,7 @@ import _ from 'underscore';
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
pipelinesComp
from
'
~/pipelines/components/pipelines.vue
'
;
import
pipelinesComp
from
'
~/pipelines/components/pipelines.vue
'
;
import
Store
from
'
~/pipelines/stores/pipelines_store
'
;
import
Store
from
'
~/pipelines/stores/pipelines_store
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Pipelines
'
,
()
=>
{
describe
(
'
Pipelines
'
,
()
=>
{
const
jsonFixtureName
=
'
pipelines/pipelines.json
'
;
const
jsonFixtureName
=
'
pipelines/pipelines.json
'
;
...
...
spec/javascripts/profile/account/components/delete_account_modal_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
deleteAccountModal
from
'
~/profile/account/components/delete_account_modal.vue
'
;
import
deleteAccountModal
from
'
~/profile/account/components/delete_account_modal.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
DeleteAccountModal component
'
,
()
=>
{
describe
(
'
DeleteAccountModal component
'
,
()
=>
{
const
actionUrl
=
`
${
gl
.
TEST_HOST
}
/delete/user`
;
const
actionUrl
=
`
${
gl
.
TEST_HOST
}
/delete/user`
;
...
...
spec/javascripts/projects_dropdown/components/app_spec.js
View file @
9167989f
...
@@ -6,7 +6,7 @@ import eventHub from '~/projects_dropdown/event_hub';
...
@@ -6,7 +6,7 @@ import eventHub from '~/projects_dropdown/event_hub';
import
ProjectsStore
from
'
~/projects_dropdown/store/projects_store
'
;
import
ProjectsStore
from
'
~/projects_dropdown/store/projects_store
'
;
import
ProjectsService
from
'
~/projects_dropdown/service/projects_service
'
;
import
ProjectsService
from
'
~/projects_dropdown/service/projects_service
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
currentSession
,
mockProject
,
mockRawProject
}
from
'
../mock_data
'
;
import
{
currentSession
,
mockProject
,
mockRawProject
}
from
'
../mock_data
'
;
const
createComponent
=
()
=>
{
const
createComponent
=
()
=>
{
...
...
spec/javascripts/projects_dropdown/components/projects_list_frequent_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
projectsListFrequentComponent
from
'
~/projects_dropdown/components/projects_list_frequent.vue
'
;
import
projectsListFrequentComponent
from
'
~/projects_dropdown/components/projects_list_frequent.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
mockFrequents
}
from
'
../mock_data
'
;
import
{
mockFrequents
}
from
'
../mock_data
'
;
const
createComponent
=
()
=>
{
const
createComponent
=
()
=>
{
...
...
spec/javascripts/projects_dropdown/components/projects_list_item_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
projectsListItemComponent
from
'
~/projects_dropdown/components/projects_list_item.vue
'
;
import
projectsListItemComponent
from
'
~/projects_dropdown/components/projects_list_item.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
mockProject
}
from
'
../mock_data
'
;
import
{
mockProject
}
from
'
../mock_data
'
;
const
createComponent
=
()
=>
{
const
createComponent
=
()
=>
{
...
...
spec/javascripts/projects_dropdown/components/projects_list_search_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
projectsListSearchComponent
from
'
~/projects_dropdown/components/projects_list_search.vue
'
;
import
projectsListSearchComponent
from
'
~/projects_dropdown/components/projects_list_search.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
mockProject
}
from
'
../mock_data
'
;
import
{
mockProject
}
from
'
../mock_data
'
;
const
createComponent
=
()
=>
{
const
createComponent
=
()
=>
{
...
...
spec/javascripts/projects_dropdown/components/search_spec.js
View file @
9167989f
...
@@ -3,7 +3,7 @@ import Vue from 'vue';
...
@@ -3,7 +3,7 @@ import Vue from 'vue';
import
searchComponent
from
'
~/projects_dropdown/components/search.vue
'
;
import
searchComponent
from
'
~/projects_dropdown/components/search.vue
'
;
import
eventHub
from
'
~/projects_dropdown/event_hub
'
;
import
eventHub
from
'
~/projects_dropdown/event_hub
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
createComponent
=
()
=>
{
const
createComponent
=
()
=>
{
const
Component
=
Vue
.
extend
(
searchComponent
);
const
Component
=
Vue
.
extend
(
searchComponent
);
...
...
spec/javascripts/registry/components/app_spec.js
View file @
9167989f
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
registry
from
'
~/registry/components/app.vue
'
;
import
registry
from
'
~/registry/components/app.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
reposServerResponse
}
from
'
../mock_data
'
;
import
{
reposServerResponse
}
from
'
../mock_data
'
;
describe
(
'
Registry List
'
,
()
=>
{
describe
(
'
Registry List
'
,
()
=>
{
...
...
spec/javascripts/repo/components/commit_sidebar/list_collapsed_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
listCollapsed
from
'
~/ide/components/commit_sidebar/list_collapsed.vue
'
;
import
listCollapsed
from
'
~/ide/components/commit_sidebar/list_collapsed.vue
'
;
import
{
createComponentWithStore
}
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
file
}
from
'
../../helpers
'
;
import
{
file
}
from
'
../../helpers
'
;
describe
(
'
Multi-file editor commit sidebar list collapsed
'
,
()
=>
{
describe
(
'
Multi-file editor commit sidebar list collapsed
'
,
()
=>
{
...
...
spec/javascripts/repo/components/commit_sidebar/list_item_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
listItem
from
'
~/ide/components/commit_sidebar/list_item.vue
'
;
import
listItem
from
'
~/ide/components/commit_sidebar/list_item.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
file
}
from
'
../../helpers
'
;
import
{
file
}
from
'
../../helpers
'
;
describe
(
'
Multi-file editor commit sidebar list item
'
,
()
=>
{
describe
(
'
Multi-file editor commit sidebar list item
'
,
()
=>
{
...
...
spec/javascripts/repo/components/commit_sidebar/list_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
commitSidebarList
from
'
~/ide/components/commit_sidebar/list.vue
'
;
import
commitSidebarList
from
'
~/ide/components/commit_sidebar/list.vue
'
;
import
{
createComponentWithStore
}
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
file
}
from
'
../../helpers
'
;
import
{
file
}
from
'
../../helpers
'
;
describe
(
'
Multi-file editor commit sidebar list
'
,
()
=>
{
describe
(
'
Multi-file editor commit sidebar list
'
,
()
=>
{
...
...
spec/javascripts/repo/components/ide_context_bar_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
ideContextBar
from
'
~/ide/components/ide_context_bar.vue
'
;
import
ideContextBar
from
'
~/ide/components/ide_context_bar.vue
'
;
import
{
createComponentWithStore
}
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Multi-file editor right context bar
'
,
()
=>
{
describe
(
'
Multi-file editor right context bar
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/repo/components/ide_side_bar_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
ideSidebar
from
'
~/ide/components/ide_side_bar.vue
'
;
import
ideSidebar
from
'
~/ide/components/ide_side_bar.vue
'
;
import
{
createComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
resetStore
}
from
'
../helpers
'
;
import
{
resetStore
}
from
'
../helpers
'
;
import
{
createComponentWithStore
}
from
'
../../helpers/vue_mount_component_helper
'
;
describe
(
'
IdeSidebar
'
,
()
=>
{
describe
(
'
IdeSidebar
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/repo/components/ide_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
ide
from
'
~/ide/components/ide.vue
'
;
import
ide
from
'
~/ide/components/ide.vue
'
;
import
{
createComponentWithStore
}
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
file
,
resetStore
}
from
'
../helpers
'
;
import
{
file
,
resetStore
}
from
'
../helpers
'
;
describe
(
'
ide component
'
,
()
=>
{
describe
(
'
ide component
'
,
()
=>
{
...
...
spec/javascripts/repo/components/new_branch_form_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
newBranchForm
from
'
~/ide/components/new_branch_form.vue
'
;
import
newBranchForm
from
'
~/ide/components/new_branch_form.vue
'
;
import
{
createComponentWithStore
}
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
resetStore
}
from
'
../helpers
'
;
import
{
resetStore
}
from
'
../helpers
'
;
describe
(
'
Multi-file editor new branch form
'
,
()
=>
{
describe
(
'
Multi-file editor new branch form
'
,
()
=>
{
...
...
spec/javascripts/repo/components/new_dropdown/index_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
newDropdown
from
'
~/ide/components/new_dropdown/index.vue
'
;
import
newDropdown
from
'
~/ide/components/new_dropdown/index.vue
'
;
import
{
createComponentWithStore
}
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
resetStore
}
from
'
../../helpers
'
;
import
{
resetStore
}
from
'
../../helpers
'
;
describe
(
'
new dropdown component
'
,
()
=>
{
describe
(
'
new dropdown component
'
,
()
=>
{
...
...
spec/javascripts/repo/components/new_dropdown/modal_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
service
from
'
~/ide/services
'
;
import
service
from
'
~/ide/services
'
;
import
modal
from
'
~/ide/components/new_dropdown/modal.vue
'
;
import
modal
from
'
~/ide/components/new_dropdown/modal.vue
'
;
import
{
createComponentWithStore
}
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
file
,
resetStore
}
from
'
../../helpers
'
;
import
{
file
,
resetStore
}
from
'
../../helpers
'
;
describe
(
'
new file modal component
'
,
()
=>
{
describe
(
'
new file modal component
'
,
()
=>
{
...
...
spec/javascripts/repo/components/new_dropdown/upload_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
upload
from
'
~/ide/components/new_dropdown/upload.vue
'
;
import
upload
from
'
~/ide/components/new_dropdown/upload.vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
service
from
'
~/ide/services
'
;
import
service
from
'
~/ide/services
'
;
import
{
createComponentWithStore
}
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
{
resetStore
}
from
'
../../helpers
'
;
import
{
resetStore
}
from
'
../../helpers
'
;
describe
(
'
new dropdown upload
'
,
()
=>
{
describe
(
'
new dropdown upload
'
,
()
=>
{
...
...
spec/javascripts/repo/components/repo_commit_section_spec.js
View file @
9167989f
...
@@ -3,7 +3,7 @@ import * as urlUtils from '~/lib/utils/url_utility';
...
@@ -3,7 +3,7 @@ import * as urlUtils from '~/lib/utils/url_utility';
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
service
from
'
~/ide/services
'
;
import
service
from
'
~/ide/services
'
;
import
repoCommitSection
from
'
~/ide/components/repo_commit_section.vue
'
;
import
repoCommitSection
from
'
~/ide/components/repo_commit_section.vue
'
;
import
getSetTimeoutPromise
from
'
../..
/helpers/set_timeout_promise_helper
'
;
import
getSetTimeoutPromise
from
'
spec
/helpers/set_timeout_promise_helper
'
;
import
{
file
,
resetStore
}
from
'
../helpers
'
;
import
{
file
,
resetStore
}
from
'
../helpers
'
;
describe
(
'
RepoCommitSection
'
,
()
=>
{
describe
(
'
RepoCommitSection
'
,
()
=>
{
...
...
spec/javascripts/sidebar/lock/edit_form_buttons_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
editFormButtons
from
'
~/sidebar/components/lock/edit_form_buttons.vue
'
;
import
editFormButtons
from
'
~/sidebar/components/lock/edit_form_buttons.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
EditFormButtons
'
,
()
=>
{
describe
(
'
EditFormButtons
'
,
()
=>
{
let
vm1
;
let
vm1
;
...
...
spec/javascripts/sidebar/participants_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
participants
from
'
~/sidebar/components/participants/participants.vue
'
;
import
participants
from
'
~/sidebar/components/participants/participants.vue
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
PARTICIPANT
=
{
const
PARTICIPANT
=
{
id
:
1
,
id
:
1
,
...
...
spec/javascripts/sidebar/sidebar_assignees_spec.js
View file @
9167989f
...
@@ -4,8 +4,8 @@ import SidebarAssignees from '~/sidebar/components/assignees/sidebar_assignees';
...
@@ -4,8 +4,8 @@ import SidebarAssignees from '~/sidebar/components/assignees/sidebar_assignees';
import
SidebarMediator
from
'
~/sidebar/sidebar_mediator
'
;
import
SidebarMediator
from
'
~/sidebar/sidebar_mediator
'
;
import
SidebarService
from
'
~/sidebar/services/sidebar_service
'
;
import
SidebarService
from
'
~/sidebar/services/sidebar_service
'
;
import
SidebarStore
from
'
~/sidebar/stores/sidebar_store
'
;
import
SidebarStore
from
'
~/sidebar/stores/sidebar_store
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
Mock
from
'
./mock_data
'
;
import
Mock
from
'
./mock_data
'
;
import
mountComponent
from
'
../helpers/vue_mount_component_helper
'
;
describe
(
'
sidebar assignees
'
,
()
=>
{
describe
(
'
sidebar assignees
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/sidebar/sidebar_subscriptions_spec.js
View file @
9167989f
...
@@ -4,7 +4,7 @@ import SidebarMediator from '~/sidebar/sidebar_mediator';
...
@@ -4,7 +4,7 @@ import SidebarMediator from '~/sidebar/sidebar_mediator';
import
SidebarService
from
'
~/sidebar/services/sidebar_service
'
;
import
SidebarService
from
'
~/sidebar/services/sidebar_service
'
;
import
SidebarStore
from
'
~/sidebar/stores/sidebar_store
'
;
import
SidebarStore
from
'
~/sidebar/stores/sidebar_store
'
;
import
eventHub
from
'
~/sidebar/event_hub
'
;
import
eventHub
from
'
~/sidebar/event_hub
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
Mock
from
'
./mock_data
'
;
import
Mock
from
'
./mock_data
'
;
describe
(
'
Sidebar Subscriptions
'
,
function
()
{
describe
(
'
Sidebar Subscriptions
'
,
function
()
{
...
...
spec/javascripts/sidebar/subscriptions_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
subscriptions
from
'
~/sidebar/components/subscriptions/subscriptions.vue
'
;
import
subscriptions
from
'
~/sidebar/components/subscriptions/subscriptions.vue
'
;
import
mountComponent
from
'
..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Subscriptions
'
,
function
()
{
describe
(
'
Subscriptions
'
,
function
()
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
authorComponent
from
'
~/vue_merge_request_widget/components/mr_widget_author.vue
'
;
import
authorComponent
from
'
~/vue_merge_request_widget/components/mr_widget_author.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetAuthor
'
,
()
=>
{
describe
(
'
MRWidgetAuthor
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
authorTimeComponent
from
'
~/vue_merge_request_widget/components/mr_widget_author_time.vue
'
;
import
authorTimeComponent
from
'
~/vue_merge_request_widget/components/mr_widget_author_time.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetAuthorTime
'
,
()
=>
{
describe
(
'
MRWidgetAuthorTime
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
headerComponent
from
'
~/vue_merge_request_widget/components/mr_widget_header.vue
'
;
import
headerComponent
from
'
~/vue_merge_request_widget/components/mr_widget_header.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetHeader
'
,
()
=>
{
describe
(
'
MRWidgetHeader
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
mergeHelpComponent
from
'
~/vue_merge_request_widget/components/mr_widget_merge_help.vue
'
;
import
mergeHelpComponent
from
'
~/vue_merge_request_widget/components/mr_widget_merge_help.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetMergeHelp
'
,
()
=>
{
describe
(
'
MRWidgetMergeHelp
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
pipelineComponent
from
'
~/vue_merge_request_widget/components/mr_widget_pipeline.vue
'
;
import
pipelineComponent
from
'
~/vue_merge_request_widget/components/mr_widget_pipeline.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
import
mockData
from
'
../mock_data
'
;
import
mockData
from
'
../mock_data
'
;
describe
(
'
MRWidgetPipeline
'
,
()
=>
{
describe
(
'
MRWidgetPipeline
'
,
()
=>
{
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
component
from
'
~/vue_merge_request_widget/components/states/mr_widget_rebase.vue
'
;
import
component
from
'
~/vue_merge_request_widget/components/states/mr_widget_rebase.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Merge request widget rebase component
'
,
()
=>
{
describe
(
'
Merge request widget rebase component
'
,
()
=>
{
let
Component
;
let
Component
;
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
relatedLinksComponent
from
'
~/vue_merge_request_widget/components/mr_widget_related_links.vue
'
;
import
relatedLinksComponent
from
'
~/vue_merge_request_widget/components/mr_widget_related_links.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetRelatedLinks
'
,
()
=>
{
describe
(
'
MRWidgetRelatedLinks
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
mrStatusIcon
from
'
~/vue_merge_request_widget/components/mr_widget_status_icon.vue
'
;
import
mrStatusIcon
from
'
~/vue_merge_request_widget/components/mr_widget_status_icon.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MR widget status icon component
'
,
()
=>
{
describe
(
'
MR widget status icon component
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_archived_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
archivedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_archived.vue
'
;
import
archivedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_archived.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetArchived
'
,
()
=>
{
describe
(
'
MRWidgetArchived
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
autoMergeFailedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
'
;
import
autoMergeFailedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetAutoMergeFailed
'
,
()
=>
{
describe
(
'
MRWidgetAutoMergeFailed
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_checking_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
checkingComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_checking.vue
'
;
import
checkingComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_checking.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetChecking
'
,
()
=>
{
describe
(
'
MRWidgetChecking
'
,
()
=>
{
let
Component
;
let
Component
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_closed_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
closedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_closed.vue
'
;
import
closedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_closed.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetClosed
'
,
()
=>
{
describe
(
'
MRWidgetClosed
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
conflictsComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
'
;
import
conflictsComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetConflicts
'
,
()
=>
{
describe
(
'
MRWidgetConflicts
'
,
()
=>
{
let
Component
;
let
Component
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
failedToMergeComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
'
;
import
failedToMergeComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetFailedToMerge
'
,
()
=>
{
describe
(
'
MRWidgetFailedToMerge
'
,
()
=>
{
let
Component
;
let
Component
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_merge_when_pipeline_succeeds_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
mwpsComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
'
;
import
mwpsComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetMergeWhenPipelineSucceeds
'
,
()
=>
{
describe
(
'
MRWidgetMergeWhenPipelineSucceeds
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
mergedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_merged.vue
'
;
import
mergedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_merged.vue
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetMerged
'
,
()
=>
{
describe
(
'
MRWidgetMerged
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
mergingComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_merging.vue
'
;
import
mergingComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_merging.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetMerging
'
,
()
=>
{
describe
(
'
MRWidgetMerging
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
missingBranchComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue
'
;
import
missingBranchComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetMissingBranch
'
,
()
=>
{
describe
(
'
MRWidgetMissingBranch
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_not_allowed_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
notAllowedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue
'
;
import
notAllowedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetNotAllowed
'
,
()
=>
{
describe
(
'
MRWidgetNotAllowed
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
pipelineBlockedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
'
;
import
pipelineBlockedComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
MRWidgetPipelineBlocked
'
,
()
=>
{
describe
(
'
MRWidgetPipelineBlocked
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
View file @
9167989f
...
@@ -3,8 +3,8 @@ import mrWidgetOptions from '~/vue_merge_request_widget/mr_widget_options';
...
@@ -3,8 +3,8 @@ import mrWidgetOptions from '~/vue_merge_request_widget/mr_widget_options';
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
notify
from
'
~/lib/utils/notify
'
;
import
notify
from
'
~/lib/utils/notify
'
;
import
{
stateKey
}
from
'
~/vue_merge_request_widget/stores/state_maps
'
;
import
{
stateKey
}
from
'
~/vue_merge_request_widget/stores/state_maps
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
mockData
from
'
./mock_data
'
;
import
mockData
from
'
./mock_data
'
;
import
mountComponent
from
'
../helpers/vue_mount_component_helper
'
;
const
returnPromise
=
data
=>
new
Promise
((
resolve
)
=>
{
const
returnPromise
=
data
=>
new
Promise
((
resolve
)
=>
{
resolve
({
resolve
({
...
...
spec/javascripts/vue_shared/components/ci_badge_link_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
ciBadge
from
'
~/vue_shared/components/ci_badge_link.vue
'
;
import
ciBadge
from
'
~/vue_shared/components/ci_badge_link.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
CI Badge Link Component
'
,
()
=>
{
describe
(
'
CI Badge Link Component
'
,
()
=>
{
let
CIBadge
;
let
CIBadge
;
...
...
spec/javascripts/vue_shared/components/clipboard_button_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
clipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
clipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
clipboard button
'
,
()
=>
{
describe
(
'
clipboard button
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/expand_button_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
expandButton
from
'
~/vue_shared/components/expand_button.vue
'
;
import
expandButton
from
'
~/vue_shared/components/expand_button.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
expand button
'
,
()
=>
{
describe
(
'
expand button
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/file_icon_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
fileIcon
from
'
~/vue_shared/components/file_icon.vue
'
;
import
fileIcon
from
'
~/vue_shared/components/file_icon.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
File Icon component
'
,
()
=>
{
describe
(
'
File Icon component
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/gl_modal_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
GlModal
from
'
~/vue_shared/components/gl_modal.vue
'
;
import
GlModal
from
'
~/vue_shared/components/gl_modal.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
modalComponent
=
Vue
.
extend
(
GlModal
);
const
modalComponent
=
Vue
.
extend
(
GlModal
);
...
...
spec/javascripts/vue_shared/components/header_ci_component_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
headerCi
from
'
~/vue_shared/components/header_ci_component.vue
'
;
import
headerCi
from
'
~/vue_shared/components/header_ci_component.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Header CI Component
'
,
()
=>
{
describe
(
'
Header CI Component
'
,
()
=>
{
let
HeaderCi
;
let
HeaderCi
;
...
...
spec/javascripts/vue_shared/components/icon_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Sprite Icon Component
'
,
function
()
{
describe
(
'
Sprite Icon Component
'
,
function
()
{
describe
(
'
Initialization
'
,
function
()
{
describe
(
'
Initialization
'
,
function
()
{
...
...
spec/javascripts/vue_shared/components/issue/issue_warning_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
issueWarning
from
'
~/vue_shared/components/issue/issue_warning.vue
'
;
import
issueWarning
from
'
~/vue_shared/components/issue/issue_warning.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
IssueWarning
=
Vue
.
extend
(
issueWarning
);
const
IssueWarning
=
Vue
.
extend
(
issueWarning
);
...
...
spec/javascripts/vue_shared/components/loading_button_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
loadingButton
from
'
~/vue_shared/components/loading_button.vue
'
;
import
loadingButton
from
'
~/vue_shared/components/loading_button.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
LABEL
=
'
Hello
'
;
const
LABEL
=
'
Hello
'
;
...
...
spec/javascripts/vue_shared/components/modal_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
modal
from
'
~/vue_shared/components/modal.vue
'
;
import
modal
from
'
~/vue_shared/components/modal.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
modalComponent
=
Vue
.
extend
(
modal
);
const
modalComponent
=
Vue
.
extend
(
modal
);
...
...
spec/javascripts/vue_shared/components/navigation_tabs_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
navigationTabs
from
'
~/vue_shared/components/navigation_tabs.vue
'
;
import
navigationTabs
from
'
~/vue_shared/components/navigation_tabs.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
navigation tabs component
'
,
()
=>
{
describe
(
'
navigation tabs component
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
placeholderSystemNote
from
'
~/vue_shared/components/notes/placeholder_system_note.vue
'
;
import
placeholderSystemNote
from
'
~/vue_shared/components/notes/placeholder_system_note.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
placeholder system note component
'
,
()
=>
{
describe
(
'
placeholder system note component
'
,
()
=>
{
let
PlaceholderSystemNote
;
let
PlaceholderSystemNote
;
...
...
spec/javascripts/vue_shared/components/panel_resizer_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
panelResizer
from
'
~/vue_shared/components/panel_resizer.vue
'
;
import
panelResizer
from
'
~/vue_shared/components/panel_resizer.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Panel Resizer component
'
,
()
=>
{
describe
(
'
Panel Resizer component
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/pikaday_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
datePicker
from
'
~/vue_shared/components/pikaday.vue
'
;
import
datePicker
from
'
~/vue_shared/components/pikaday.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
datePicker
'
,
()
=>
{
describe
(
'
datePicker
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
collapsedCalendarIcon
from
'
~/vue_shared/components/sidebar/collapsed_calendar_icon.vue
'
;
import
collapsedCalendarIcon
from
'
~/vue_shared/components/sidebar/collapsed_calendar_icon.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
collapsedCalendarIcon
'
,
()
=>
{
describe
(
'
collapsedCalendarIcon
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
collapsedGroupedDatePicker
from
'
~/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
'
;
import
collapsedGroupedDatePicker
from
'
~/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
collapsedGroupedDatePicker
'
,
()
=>
{
describe
(
'
collapsedGroupedDatePicker
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/sidebar/date_picker_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
sidebarDatePicker
from
'
~/vue_shared/components/sidebar/date_picker.vue
'
;
import
sidebarDatePicker
from
'
~/vue_shared/components/sidebar/date_picker.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
sidebarDatePicker
'
,
()
=>
{
describe
(
'
sidebarDatePicker
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/sidebar/toggle_sidebar_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
toggleSidebar
from
'
~/vue_shared/components/sidebar/toggle_sidebar.vue
'
;
import
toggleSidebar
from
'
~/vue_shared/components/sidebar/toggle_sidebar.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
toggleSidebar
'
,
()
=>
{
describe
(
'
toggleSidebar
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/skeleton_loading_container_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
skeletonLoadingContainer
from
'
~/vue_shared/components/skeleton_loading_container.vue
'
;
import
skeletonLoadingContainer
from
'
~/vue_shared/components/skeleton_loading_container.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Skeleton loading container
'
,
()
=>
{
describe
(
'
Skeleton loading container
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/stacked_progress_bar_spec.js
View file @
9167989f
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
stackedProgressBarComponent
from
'
~/vue_shared/components/stacked_progress_bar.vue
'
;
import
stackedProgressBarComponent
from
'
~/vue_shared/components/stacked_progress_bar.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
createComponent
=
(
config
)
=>
{
const
createComponent
=
(
config
)
=>
{
const
Component
=
Vue
.
extend
(
stackedProgressBarComponent
);
const
Component
=
Vue
.
extend
(
stackedProgressBarComponent
);
...
...
spec/javascripts/vue_shared/components/toggle_button_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
toggleButton
from
'
~/vue_shared/components/toggle_button.vue
'
;
import
toggleButton
from
'
~/vue_shared/components/toggle_button.vue
'
;
import
mountComponent
from
'
../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
describe
(
'
Toggle Button
'
,
()
=>
{
describe
(
'
Toggle Button
'
,
()
=>
{
let
vm
;
let
vm
;
...
...
spec/javascripts/vue_shared/components/user_avatar/user_avatar_image_spec.js
View file @
9167989f
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
{
placeholderImage
}
from
'
~/lazy_loader
'
;
import
{
placeholderImage
}
from
'
~/lazy_loader
'
;
import
userAvatarImage
from
'
~/vue_shared/components/user_avatar/user_avatar_image.vue
'
;
import
userAvatarImage
from
'
~/vue_shared/components/user_avatar/user_avatar_image.vue
'
;
import
mountComponent
from
'
../../..
/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec
/helpers/vue_mount_component_helper
'
;
const
DEFAULT_PROPS
=
{
const
DEFAULT_PROPS
=
{
size
:
99
,
size
:
99
,
...
...
spec/requests/api/issues_spec.rb
View file @
9167989f
...
@@ -1417,7 +1417,7 @@ describe API::Issues do
...
@@ -1417,7 +1417,7 @@ describe API::Issues do
context
'when source project does not exist'
do
context
'when source project does not exist'
do
it
'returns 404 when trying to move an issue'
do
it
'returns 404 when trying to move an issue'
do
post
api
(
"/projects/
12345
/issues/
#{
issue
.
iid
}
/move"
,
user
),
post
api
(
"/projects/
0
/issues/
#{
issue
.
iid
}
/move"
,
user
),
to_project_id:
target_project
.
id
to_project_id:
target_project
.
id
expect
(
response
).
to
have_gitlab_http_status
(
404
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
...
@@ -1428,7 +1428,7 @@ describe API::Issues do
...
@@ -1428,7 +1428,7 @@ describe API::Issues do
context
'when target project does not exist'
do
context
'when target project does not exist'
do
it
'returns 404 when trying to move an issue'
do
it
'returns 404 when trying to move an issue'
do
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/move"
,
user
),
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/move"
,
user
),
to_project_id:
12345
to_project_id:
0
expect
(
response
).
to
have_gitlab_http_status
(
404
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
end
...
...
spec/requests/api/v3/issues_spec.rb
View file @
9167989f
...
@@ -1218,7 +1218,7 @@ describe API::V3::Issues do
...
@@ -1218,7 +1218,7 @@ describe API::V3::Issues do
context
'when source project does not exist'
do
context
'when source project does not exist'
do
it
'returns 404 when trying to move an issue'
do
it
'returns 404 when trying to move an issue'
do
post
v3_api
(
"/projects/
123
/issues/
#{
issue
.
id
}
/move"
,
user
),
post
v3_api
(
"/projects/
0
/issues/
#{
issue
.
id
}
/move"
,
user
),
to_project_id:
target_project
.
id
to_project_id:
target_project
.
id
expect
(
response
).
to
have_gitlab_http_status
(
404
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
...
@@ -1229,7 +1229,7 @@ describe API::V3::Issues do
...
@@ -1229,7 +1229,7 @@ describe API::V3::Issues do
context
'when target project does not exist'
do
context
'when target project does not exist'
do
it
'returns 404 when trying to move an issue'
do
it
'returns 404 when trying to move an issue'
do
post
v3_api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
/move"
,
user
),
post
v3_api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
/move"
,
user
),
to_project_id:
123
to_project_id:
0
expect
(
response
).
to
have_gitlab_http_status
(
404
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
end
...
...
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