From f9fe7cda4bdbc477d8d76e5def4023f7d03bab46 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 4 Dec 2020 09:09:36 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../components/board_assignee_dropdown.vue | 2 +- .../boards/components/boards_selector.vue | 4 +- .../board_sidebar_milestone_select.vue | 2 +- .../board.fragment.graphql | 0 .../board.mutation.graphql | 0 .../board_labels.query.graphql | 0 .../board_list.fragment.graphql | 0 .../board_list_create.mutation.graphql | 2 +- .../board_list_destroy.mutation.graphql | 0 .../board_list_shared.fragment.graphql | 0 .../board_list_update.mutation.graphql | 0 .../board_lists.query.graphql | 2 +- .../group_boards.query.graphql | 2 +- .../group_milestones.query.graphql | 0 .../issue.fragment.graphql | 0 .../issue_create.mutation.graphql | 2 +- .../issue_move_list.mutation.graphql | 2 +- .../issue_set_due_date.mutation.graphql | 0 .../issue_set_labels.mutation.graphql | 0 .../issue_set_milestone.mutation.graphql | 0 .../issue_set_subscription.mutation.graphql | 0 .../lists_issues.query.graphql | 2 +- .../project_boards.query.graphql | 2 +- .../users_search.query.graphql | 0 .../javascripts/boards/stores/actions.js | 34 +-- .../javascripts/boards/stores/boards_store.js | 2 +- .../javascripts/boards/stores/getters.js | 1 - .../diffs/components/diff_file.vue | 2 +- .../diffs/components/diff_file_header.vue | 2 +- app/assets/javascripts/diffs/store/actions.js | 2 +- app/assets/javascripts/diffs/store/utils.js | 2 +- .../diffs/{ => utils}/diff_file.js | 2 +- .../components/alerts_form.vue | 4 +- .../components/pagerduty_form.vue | 31 ++- .../incidents_settings/constants.js | 16 +- .../edit/components/integration_form.vue | 5 + .../notes/components/diff_with_note.vue | 2 +- .../components/labels/sidebar_labels.vue | 2 +- .../javascripts/whats_new/components/app.vue | 130 +++++----- .../whats_new/components/feature.vue | 64 +++++ app/assets/javascripts/whats_new/index.js | 8 +- .../javascripts/whats_new/store/actions.js | 3 +- .../stylesheets/components/whats_new.scss | 26 ++ .../page_bundles/oncall_schedules.scss | 112 +++++++++ app/controllers/whats_new_controller.rb | 27 ++- app/helpers/whats_new_helper.rb | 6 +- app/models/release_highlight.rb | 38 ++- app/models/service.rb | 3 +- app/services/groups/transfer_service.rb | 13 + app/services/projects/transfer_service.rb | 11 +- app/views/layouts/header/_default.html.haml | 2 +- ...ansfer-project-group-with-integrations.yml | 5 + ...should-have-a-different-color-on-press.yml | 5 + .../tr-update-issue-to-incident.yml | 5 + doc/ci/quick_start/img/runners_activated.png | Bin 104545 -> 0 bytes lib/gitlab/experimentation.rb | 5 +- locale/gitlab.pot | 33 ++- .../settings/operations_settings_spec.rb | 2 +- .../board_assignee_dropdown_spec.js | 2 +- spec/frontend/boards/stores/actions_spec.js | 4 +- spec/frontend/boards/stores/getters_spec.js | 18 -- .../diffs/{ => utils}/diff_file_spec.js | 2 +- .../__snapshots__/alerts_form_spec.js.snap | 6 +- .../__snapshots__/pagerduty_form_spec.js.snap | 14 +- spec/frontend/sidebar/sidebar_labels_spec.js | 2 +- .../frontend/whats_new/components/app_spec.js | 229 +++++++++++------- spec/frontend/whats_new/store/actions_spec.js | 17 ++ spec/helpers/whats_new_helper_spec.rb | 14 +- spec/models/release_highlight_spec.rb | 98 +++++--- spec/requests/whats_new_controller_spec.rb | 22 +- spec/services/groups/transfer_service_spec.rb | 71 ++++-- .../projects/transfer_service_spec.rb | 27 ++- 73 files changed, 800 insertions(+), 355 deletions(-) rename app/assets/javascripts/boards/{queries => graphql}/board.fragment.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/board.mutation.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/board_labels.query.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/board_list.fragment.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/board_list_create.mutation.graphql (85%) rename app/assets/javascripts/boards/{queries => graphql}/board_list_destroy.mutation.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/board_list_shared.fragment.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/board_list_update.mutation.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/board_lists.query.graphql (89%) rename app/assets/javascripts/boards/{queries => graphql}/group_boards.query.graphql (74%) rename app/assets/javascripts/boards/{queries => graphql}/group_milestones.query.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/issue.fragment.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/issue_create.mutation.graphql (69%) rename app/assets/javascripts/boards/{queries => graphql}/issue_move_list.mutation.graphql (88%) rename app/assets/javascripts/boards/{queries => graphql}/issue_set_due_date.mutation.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/issue_set_labels.mutation.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/issue_set_milestone.mutation.graphql (100%) rename app/assets/javascripts/boards/graphql/{mutations => }/issue_set_subscription.mutation.graphql (100%) rename app/assets/javascripts/boards/{queries => graphql}/lists_issues.query.graphql (94%) rename app/assets/javascripts/boards/{queries => graphql}/project_boards.query.graphql (74%) rename app/assets/javascripts/boards/{queries => graphql}/users_search.query.graphql (100%) rename app/assets/javascripts/diffs/{ => utils}/diff_file.js (98%) create mode 100644 app/assets/javascripts/whats_new/components/feature.vue create mode 100644 changelogs/unreleased/255923-transfer-project-group-with-integrations.yml create mode 100644 changelogs/unreleased/273270-save-button-should-have-a-different-color-on-press.yml create mode 100644 changelogs/unreleased/tr-update-issue-to-incident.yml delete mode 100644 doc/ci/quick_start/img/runners_activated.png rename spec/frontend/diffs/{ => utils}/diff_file_spec.js (96%) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 43c5a59ef08..f14b86c836c 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -add5f3dd182c99b4d9e1cf93e45fec1214c00659 +9fd57cbd0b63d448f9a9555b53f065ee1c110199 diff --git a/app/assets/javascripts/boards/components/board_assignee_dropdown.vue b/app/assets/javascripts/boards/components/board_assignee_dropdown.vue index b4a9d34e738..76b468a3402 100644 --- a/app/assets/javascripts/boards/components/board_assignee_dropdown.vue +++ b/app/assets/javascripts/boards/components/board_assignee_dropdown.vue @@ -14,7 +14,7 @@ import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue'; import getIssueParticipants from '~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql'; -import searchUsers from '~/boards/queries/users_search.query.graphql'; +import searchUsers from '~/boards/graphql/users_search.query.graphql'; export default { noSearchDelay: 0, diff --git a/app/assets/javascripts/boards/components/boards_selector.vue b/app/assets/javascripts/boards/components/boards_selector.vue index 2daec46e64b..435ea3f8b7a 100644 --- a/app/assets/javascripts/boards/components/boards_selector.vue +++ b/app/assets/javascripts/boards/components/boards_selector.vue @@ -12,8 +12,8 @@ import { import httpStatusCodes from '~/lib/utils/http_status'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import projectQuery from '../queries/project_boards.query.graphql'; -import groupQuery from '../queries/group_boards.query.graphql'; +import projectQuery from '../graphql/project_boards.query.graphql'; +import groupQuery from '../graphql/group_boards.query.graphql'; import boardsStore from '../stores/boards_store'; import BoardForm from './board_form.vue'; diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue index f7b7fd3f61f..78c3f8acc62 100644 --- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue +++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue @@ -10,7 +10,7 @@ import { } from '@gitlab/ui'; import { fetchPolicies } from '~/lib/graphql'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; -import groupMilestones from '../../queries/group_milestones.query.graphql'; +import groupMilestones from '../../graphql/group_milestones.query.graphql'; import createFlash from '~/flash'; import { __, s__ } from '~/locale'; diff --git a/app/assets/javascripts/boards/queries/board.fragment.graphql b/app/assets/javascripts/boards/graphql/board.fragment.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/board.fragment.graphql rename to app/assets/javascripts/boards/graphql/board.fragment.graphql diff --git a/app/assets/javascripts/boards/queries/board.mutation.graphql b/app/assets/javascripts/boards/graphql/board.mutation.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/board.mutation.graphql rename to app/assets/javascripts/boards/graphql/board.mutation.graphql diff --git a/app/assets/javascripts/boards/queries/board_labels.query.graphql b/app/assets/javascripts/boards/graphql/board_labels.query.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/board_labels.query.graphql rename to app/assets/javascripts/boards/graphql/board_labels.query.graphql diff --git a/app/assets/javascripts/boards/queries/board_list.fragment.graphql b/app/assets/javascripts/boards/graphql/board_list.fragment.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/board_list.fragment.graphql rename to app/assets/javascripts/boards/graphql/board_list.fragment.graphql diff --git a/app/assets/javascripts/boards/queries/board_list_create.mutation.graphql b/app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql similarity index 85% rename from app/assets/javascripts/boards/queries/board_list_create.mutation.graphql rename to app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql index 48420b349ae..f78a21baa7f 100644 --- a/app/assets/javascripts/boards/queries/board_list_create.mutation.graphql +++ b/app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql @@ -1,4 +1,4 @@ -#import "ee_else_ce/boards/queries/board_list.fragment.graphql" +#import "ee_else_ce/boards/graphql/board_list.fragment.graphql" mutation CreateBoardList( $boardId: BoardID! diff --git a/app/assets/javascripts/boards/queries/board_list_destroy.mutation.graphql b/app/assets/javascripts/boards/graphql/board_list_destroy.mutation.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/board_list_destroy.mutation.graphql rename to app/assets/javascripts/boards/graphql/board_list_destroy.mutation.graphql diff --git a/app/assets/javascripts/boards/queries/board_list_shared.fragment.graphql b/app/assets/javascripts/boards/graphql/board_list_shared.fragment.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/board_list_shared.fragment.graphql rename to app/assets/javascripts/boards/graphql/board_list_shared.fragment.graphql diff --git a/app/assets/javascripts/boards/queries/board_list_update.mutation.graphql b/app/assets/javascripts/boards/graphql/board_list_update.mutation.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/board_list_update.mutation.graphql rename to app/assets/javascripts/boards/graphql/board_list_update.mutation.graphql diff --git a/app/assets/javascripts/boards/queries/board_lists.query.graphql b/app/assets/javascripts/boards/graphql/board_lists.query.graphql similarity index 89% rename from app/assets/javascripts/boards/queries/board_lists.query.graphql rename to app/assets/javascripts/boards/graphql/board_lists.query.graphql index 88425e9a9c1..eb922f162f8 100644 --- a/app/assets/javascripts/boards/queries/board_lists.query.graphql +++ b/app/assets/javascripts/boards/graphql/board_lists.query.graphql @@ -1,4 +1,4 @@ -#import "ee_else_ce/boards/queries/board_list.fragment.graphql" +#import "ee_else_ce/boards/graphql/board_list.fragment.graphql" query ListIssues( $fullPath: ID! diff --git a/app/assets/javascripts/boards/queries/group_boards.query.graphql b/app/assets/javascripts/boards/graphql/group_boards.query.graphql similarity index 74% rename from app/assets/javascripts/boards/queries/group_boards.query.graphql rename to app/assets/javascripts/boards/graphql/group_boards.query.graphql index 74c224add7d..feafd6ae10d 100644 --- a/app/assets/javascripts/boards/queries/group_boards.query.graphql +++ b/app/assets/javascripts/boards/graphql/group_boards.query.graphql @@ -1,4 +1,4 @@ -#import "ee_else_ce/boards/queries/board.fragment.graphql" +#import "ee_else_ce/boards/graphql/board.fragment.graphql" query group_boards($fullPath: ID!) { group(fullPath: $fullPath) { diff --git a/app/assets/javascripts/boards/queries/group_milestones.query.graphql b/app/assets/javascripts/boards/graphql/group_milestones.query.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/group_milestones.query.graphql rename to app/assets/javascripts/boards/graphql/group_milestones.query.graphql diff --git a/app/assets/javascripts/boards/queries/issue.fragment.graphql b/app/assets/javascripts/boards/graphql/issue.fragment.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/issue.fragment.graphql rename to app/assets/javascripts/boards/graphql/issue.fragment.graphql diff --git a/app/assets/javascripts/boards/queries/issue_create.mutation.graphql b/app/assets/javascripts/boards/graphql/issue_create.mutation.graphql similarity index 69% rename from app/assets/javascripts/boards/queries/issue_create.mutation.graphql rename to app/assets/javascripts/boards/graphql/issue_create.mutation.graphql index 65be147be07..c1a2361a4e8 100644 --- a/app/assets/javascripts/boards/queries/issue_create.mutation.graphql +++ b/app/assets/javascripts/boards/graphql/issue_create.mutation.graphql @@ -1,4 +1,4 @@ -#import "ee_else_ce/boards/queries/issue.fragment.graphql" +#import "ee_else_ce/boards/graphql/issue.fragment.graphql" mutation CreateIssue($input: CreateIssueInput!) { createIssue(input: $input) { diff --git a/app/assets/javascripts/boards/queries/issue_move_list.mutation.graphql b/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql similarity index 88% rename from app/assets/javascripts/boards/queries/issue_move_list.mutation.graphql rename to app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql index ff6aa597f48..3c574fd8c87 100644 --- a/app/assets/javascripts/boards/queries/issue_move_list.mutation.graphql +++ b/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql @@ -1,4 +1,4 @@ -#import "ee_else_ce/boards/queries/issue.fragment.graphql" +#import "ee_else_ce/boards/graphql/issue.fragment.graphql" mutation IssueMoveList( $projectPath: ID! diff --git a/app/assets/javascripts/boards/queries/issue_set_due_date.mutation.graphql b/app/assets/javascripts/boards/graphql/issue_set_due_date.mutation.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/issue_set_due_date.mutation.graphql rename to app/assets/javascripts/boards/graphql/issue_set_due_date.mutation.graphql diff --git a/app/assets/javascripts/boards/queries/issue_set_labels.mutation.graphql b/app/assets/javascripts/boards/graphql/issue_set_labels.mutation.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/issue_set_labels.mutation.graphql rename to app/assets/javascripts/boards/graphql/issue_set_labels.mutation.graphql diff --git a/app/assets/javascripts/boards/queries/issue_set_milestone.mutation.graphql b/app/assets/javascripts/boards/graphql/issue_set_milestone.mutation.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/issue_set_milestone.mutation.graphql rename to app/assets/javascripts/boards/graphql/issue_set_milestone.mutation.graphql diff --git a/app/assets/javascripts/boards/graphql/mutations/issue_set_subscription.mutation.graphql b/app/assets/javascripts/boards/graphql/issue_set_subscription.mutation.graphql similarity index 100% rename from app/assets/javascripts/boards/graphql/mutations/issue_set_subscription.mutation.graphql rename to app/assets/javascripts/boards/graphql/issue_set_subscription.mutation.graphql diff --git a/app/assets/javascripts/boards/queries/lists_issues.query.graphql b/app/assets/javascripts/boards/graphql/lists_issues.query.graphql similarity index 94% rename from app/assets/javascripts/boards/queries/lists_issues.query.graphql rename to app/assets/javascripts/boards/graphql/lists_issues.query.graphql index 5dbfe4675c6..43af7d2b2f1 100644 --- a/app/assets/javascripts/boards/queries/lists_issues.query.graphql +++ b/app/assets/javascripts/boards/graphql/lists_issues.query.graphql @@ -1,4 +1,4 @@ -#import "ee_else_ce/boards/queries/issue.fragment.graphql" +#import "ee_else_ce/boards/graphql/issue.fragment.graphql" query ListIssues( $fullPath: ID! diff --git a/app/assets/javascripts/boards/queries/project_boards.query.graphql b/app/assets/javascripts/boards/graphql/project_boards.query.graphql similarity index 74% rename from app/assets/javascripts/boards/queries/project_boards.query.graphql rename to app/assets/javascripts/boards/graphql/project_boards.query.graphql index a1326bd5eff..f98d25ba671 100644 --- a/app/assets/javascripts/boards/queries/project_boards.query.graphql +++ b/app/assets/javascripts/boards/graphql/project_boards.query.graphql @@ -1,4 +1,4 @@ -#import "ee_else_ce/boards/queries/board.fragment.graphql" +#import "ee_else_ce/boards/graphql/board.fragment.graphql" query project_boards($fullPath: ID!) { project(fullPath: $fullPath) { diff --git a/app/assets/javascripts/boards/queries/users_search.query.graphql b/app/assets/javascripts/boards/graphql/users_search.query.graphql similarity index 100% rename from app/assets/javascripts/boards/queries/users_search.query.graphql rename to app/assets/javascripts/boards/graphql/users_search.query.graphql diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js index fd5049ef9bc..a7d8144f8af 100644 --- a/app/assets/javascripts/boards/stores/actions.js +++ b/app/assets/javascripts/boards/stores/actions.js @@ -1,6 +1,6 @@ import { pick } from 'lodash'; -import boardListsQuery from 'ee_else_ce/boards/queries/board_lists.query.graphql'; +import boardListsQuery from 'ee_else_ce/boards/graphql/board_lists.query.graphql'; import createGqClient, { fetchPolicies } from '~/lib/graphql'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { BoardType, ListType, inactiveId, DEFAULT_LABELS } from '~/boards/constants'; @@ -14,18 +14,18 @@ import { } from '../boards_util'; import boardStore from '~/boards/stores/boards_store'; -import updateAssignees from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql'; -import listsIssuesQuery from '../queries/lists_issues.query.graphql'; -import boardLabelsQuery from '../queries/board_labels.query.graphql'; -import createBoardListMutation from '../queries/board_list_create.mutation.graphql'; -import updateBoardListMutation from '../queries/board_list_update.mutation.graphql'; -import issueMoveListMutation from '../queries/issue_move_list.mutation.graphql'; -import destroyBoardListMutation from '../queries/board_list_destroy.mutation.graphql'; -import issueCreateMutation from '../queries/issue_create.mutation.graphql'; -import issueSetLabels from '../queries/issue_set_labels.mutation.graphql'; -import issueSetDueDate from '../queries/issue_set_due_date.mutation.graphql'; -import issueSetSubscriptionMutation from '../graphql/mutations/issue_set_subscription.mutation.graphql'; -import issueSetMilestone from '../queries/issue_set_milestone.mutation.graphql'; +import updateAssigneesMutation from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql'; +import listsIssuesQuery from '../graphql/lists_issues.query.graphql'; +import boardLabelsQuery from '../graphql/board_labels.query.graphql'; +import createBoardListMutation from '../graphql/board_list_create.mutation.graphql'; +import updateBoardListMutation from '../graphql/board_list_update.mutation.graphql'; +import issueMoveListMutation from '../graphql/issue_move_list.mutation.graphql'; +import destroyBoardListMutation from '../graphql/board_list_destroy.mutation.graphql'; +import issueCreateMutation from '../graphql/issue_create.mutation.graphql'; +import issueSetLabelsMutation from '../graphql/issue_set_labels.mutation.graphql'; +import issueSetDueDateMutation from '../graphql/issue_set_due_date.mutation.graphql'; +import issueSetSubscriptionMutation from '../graphql/issue_set_subscription.mutation.graphql'; +import issueSetMilestoneMutation from '../graphql/issue_set_milestone.mutation.graphql'; const notImplemented = () => { /* eslint-disable-next-line @gitlab/require-i18n-strings */ @@ -324,7 +324,7 @@ export default { return gqlClient .mutate({ - mutation: updateAssignees, + mutation: updateAssigneesMutation, variables: { iid: getters.activeIssue.iid, projectPath: getters.activeIssue.referencePath.split('#')[0], @@ -350,7 +350,7 @@ export default { setActiveIssueMilestone: async ({ commit, getters }, input) => { const { activeIssue } = getters; const { data } = await gqlClient.mutate({ - mutation: issueSetMilestone, + mutation: issueSetMilestoneMutation, variables: { input: { iid: String(activeIssue.iid), @@ -416,7 +416,7 @@ export default { setActiveIssueLabels: async ({ commit, getters }, input) => { const { activeIssue } = getters; const { data } = await gqlClient.mutate({ - mutation: issueSetLabels, + mutation: issueSetLabelsMutation, variables: { input: { iid: String(activeIssue.iid), @@ -441,7 +441,7 @@ export default { setActiveIssueDueDate: async ({ commit, getters }, input) => { const { activeIssue } = getters; const { data } = await gqlClient.mutate({ - mutation: issueSetDueDate, + mutation: issueSetDueDateMutation, variables: { input: { iid: String(activeIssue.iid), diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index 2a4bf7c7288..fa1ffdfa26a 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -22,7 +22,7 @@ import ListLabel from '../models/label'; import ListAssignee from '../models/assignee'; import ListMilestone from '../models/milestone'; -import createBoardMutation from '../queries/board.mutation.graphql'; +import createBoardMutation from '../graphql/board.mutation.graphql'; const PER_PAGE = 20; export const gqlClient = createDefaultClient(); diff --git a/app/assets/javascripts/boards/stores/getters.js b/app/assets/javascripts/boards/stores/getters.js index d2517fd2cfc..ca6887b6f45 100644 --- a/app/assets/javascripts/boards/stores/getters.js +++ b/app/assets/javascripts/boards/stores/getters.js @@ -2,7 +2,6 @@ import { find } from 'lodash'; import { inactiveId } from '../constants'; export default { - labelToggleState: state => (state.isShowingLabels ? 'on' : 'off'), isSidebarOpen: state => state.activeId !== inactiveId, isSwimlanesOn: () => false, getIssueById: state => id => { diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 32191d7e309..ed94cabe124 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -10,7 +10,7 @@ import notesEventHub from '../../notes/event_hub'; import DiffFileHeader from './diff_file_header.vue'; import DiffContent from './diff_content.vue'; import { diffViewerErrors } from '~/ide/constants'; -import { collapsedType, isCollapsed } from '../diff_file'; +import { collapsedType, isCollapsed } from '../utils/diff_file'; import { DIFF_FILE_AUTOMATIC_COLLAPSE, DIFF_FILE_MANUAL_COLLAPSE, diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue index 6dc9c71e1cd..53d1383b82e 100644 --- a/app/assets/javascripts/diffs/components/diff_file_header.vue +++ b/app/assets/javascripts/diffs/components/diff_file_header.vue @@ -19,7 +19,7 @@ import { __, s__, sprintf } from '~/locale'; import { diffViewerModes } from '~/ide/constants'; import DiffStats from './diff_stats.vue'; import { scrollToElement } from '~/lib/utils/common_utils'; -import { isCollapsed } from '../diff_file'; +import { isCollapsed } from '../utils/diff_file'; import { DIFF_FILE_HEADER } from '../i18n'; export default { diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index c41828a4221..e7f950f15c1 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -49,7 +49,7 @@ import { DIFF_FILE_BY_FILE_COOKIE_NAME, } from '../constants'; import { diffViewerModes } from '~/ide/constants'; -import { isCollapsed } from '../diff_file'; +import { isCollapsed } from '../utils/diff_file'; export const setBaseConfig = ({ commit }, options) => { const { diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index 8f32952676a..8949c8cd23e 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -16,7 +16,7 @@ import { SHOW_WHITESPACE, NO_SHOW_WHITESPACE, } from '../constants'; -import { prepareRawDiffFile } from '../diff_file'; +import { prepareRawDiffFile } from '../utils/diff_file'; export const isAdded = line => ['new', 'new-nonewline'].includes(line.type); export const isRemoved = line => ['old', 'old-nonewline'].includes(line.type); diff --git a/app/assets/javascripts/diffs/diff_file.js b/app/assets/javascripts/diffs/utils/diff_file.js similarity index 98% rename from app/assets/javascripts/diffs/diff_file.js rename to app/assets/javascripts/diffs/utils/diff_file.js index a14a30b41a9..aa801783c57 100644 --- a/app/assets/javascripts/diffs/diff_file.js +++ b/app/assets/javascripts/diffs/utils/diff_file.js @@ -3,7 +3,7 @@ import { DIFF_FILE_DELETED_MODE, DIFF_FILE_MANUAL_COLLAPSE, DIFF_FILE_AUTOMATIC_COLLAPSE, -} from './constants'; +} from '../constants'; function fileSymlinkInformation(file, fileList) { const duplicates = fileList.filter(iteratedFile => iteratedFile.file_hash === file.file_hash); diff --git a/app/assets/javascripts/incidents_settings/components/alerts_form.vue b/app/assets/javascripts/incidents_settings/components/alerts_form.vue index 5fe0badc56e..e8daad8811e 100644 --- a/app/assets/javascripts/incidents_settings/components/alerts_form.vue +++ b/app/assets/javascripts/incidents_settings/components/alerts_form.vue @@ -86,7 +86,7 @@ export default {
- {{ $options.i18n.createIssue.label }} + {{ $options.i18n.createIncident.label }} @@ -96,7 +96,7 @@ export default { class="col-8 col-md-9 gl-px-6" >