From 1e6730a4e32f6cbf4b84aa9fc13204778783f33c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 25 Jun 2021 00:08:34 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .eslintrc.yml | 8 ++ .../batch_comments/components/draft_note.vue | 8 +- .../contributors/components/contributors.vue | 36 +++++---- app/assets/javascripts/frequent_items/utils.js | 10 ++- .../issuable_create/components/issuable_form.vue | 21 ++--- .../members/components/members_tabs.vue | 2 +- .../milestones/components/milestone_combobox.vue | 2 +- .../monitoring/components/charts/time_series.vue | 20 +++-- .../components/dashboard_actions_menu.vue | 34 ++++---- .../nav/components/top_nav_container_view.vue | 12 ++- .../notes/components/discussion_notes.vue | 25 +++--- .../notes/components/noteable_discussion.vue | 4 +- .../javascripts/notes/components/noteable_note.vue | 8 +- .../projects/forks/new/components/fork_form.vue | 2 +- .../labels/components/promote_label_modal.vue | 43 +++++----- .../components/service_desk_root.vue | 7 +- .../modals/insert_video_modal.vue | 12 +-- .../terraform/components/terraform_list.vue | 2 +- .../components/states/ready_to_merge.vue | 26 +++--- .../vue_shared/components/actions_button.vue | 2 +- .../ci_cd_analytics/ci_cd_analytics_area_chart.vue | 29 ++++--- .../ci_cd_analytics/ci_cd_analytics_charts.vue | 9 ++- .../vue_shared/components/expand_button.vue | 2 +- .../vue_shared/components/gl_modal_vuex.vue | 4 +- .../vue_shared/components/notes/system_note.vue | 2 +- app/assets/stylesheets/startup/startup-signin.scss | 6 ++ app/assets/stylesheets/utilities.scss | 32 +++++++- app/graphql/mutations/packages/destroy.rb | 37 +++++++++ app/graphql/types/mutation_type.rb | 1 + app/models/service_desk_setting.rb | 5 +- app/services/packages/destroy_package_service.rb | 33 ++++++++ app/views/devise/shared/_signup_box.html.haml | 2 +- app/views/layouts/minimal.html.haml | 3 +- app/views/projects/branches/new.html.haml | 8 +- .../_alert_moved_from_service_desk.html.haml | 9 ++- .../registrations/experience_levels/show.html.haml | 1 + doc/api/graphql/reference/index.md | 18 +++++ doc/user/application_security/dast/index.md | 1 + doc/user/project/merge_requests/code_quality.md | 14 ++-- lib/api/project_packages.rb | 4 +- locale/gitlab.pot | 3 + .../batch_comments/components/draft_note_spec.js | 12 +++ spec/frontend/frequent_items/utils_spec.js | 47 +++++------ .../components/issuable_form_spec.js | 3 + .../components/charts/time_series_spec.js | 4 +- .../components/dashboard_actions_menu_spec.js | 7 +- .../frontend/nav/components/responsive_app_spec.js | 2 + .../nav/components/top_nav_container_view_spec.js | 5 +- .../notes/components/discussion_notes_spec.js | 14 ++-- .../forks/new/components/fork_form_spec.js | 2 +- .../ci_cd_analytics_area_chart_spec.js.snap | 6 +- .../terraform/components/terraform_list_spec.js | 3 + .../components/states/commit_edit_spec.js | 2 +- .../states/mr_widget_ready_to_merge_spec.js | 3 + .../diff_viewer/viewers/image_diff_viewer_spec.js | 4 +- .../vue_shared/components/paginated_list_spec.js | 8 +- .../resizable_chart_container_spec.js.snap | 30 +++---- .../resizable_chart_container_spec.js | 10 ++- spec/models/service_desk_setting_spec.rb | 2 +- .../mutations/packages/destroy_package_spec.rb | 93 ++++++++++++++++++++++ .../packages/destroy_package_service_spec.rb | 61 ++++++++++++++ .../src/components/DynamicScroller.vue | 6 +- 62 files changed, 602 insertions(+), 229 deletions(-) create mode 100644 app/graphql/mutations/packages/destroy.rb create mode 100644 app/services/packages/destroy_package_service.rb create mode 100644 spec/requests/api/graphql/mutations/packages/destroy_package_spec.rb create mode 100644 spec/services/packages/destroy_package_service_spec.rb diff --git a/.eslintrc.yml b/.eslintrc.yml index b6abb574e19..b1847fd9c6b 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -17,6 +17,14 @@ settings: webpack: config: './config/webpack.config.js' rules: + # BEGIN Disallow deprecated slot syntax + # TODO: Remove once + # https://gitlab.com/gitlab-org/frontend/eslint-plugin/-/issues/31 is closed + # and consumed by GitLab. + vue/no-deprecated-scope-attribute: error + vue/no-deprecated-slot-attribute: error + vue/no-deprecated-slot-scope-attribute: error + # END Disallow deprecated slot syntax import/no-commonjs: error import/no-default-export: off no-underscore-dangle: diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue index e6de724512f..96c3b8276ee 100644 --- a/app/assets/javascripts/batch_comments/components/draft_note.vue +++ b/app/assets/javascripts/batch_comments/components/draft_note.vue @@ -94,9 +94,11 @@ export default { @handleUpdateNote="update" @toggleResolveStatus="toggleResolveDiscussion(draft.id)" > - - {{ __('Pending') }} - + diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue index 25ce6500094..512f060e2ea 100644 --- a/app/assets/javascripts/contributors/components/contributors.vue +++ b/app/assets/javascripts/contributors/components/contributors.vue @@ -204,15 +204,16 @@ export default {

{{ __('Commits to') }} {{ branch }}

{{ __('Excluding merge commits. Limited to 6,000 commits.') }} - +
@@ -226,14 +227,15 @@ export default { {{ n__('%d commit', '%d commits', contributor.commits) }} ({{ contributor.email }})

- +
diff --git a/app/assets/javascripts/frequent_items/utils.js b/app/assets/javascripts/frequent_items/utils.js index 88519d934cb..27ef47df8c8 100644 --- a/app/assets/javascripts/frequent_items/utils.js +++ b/app/assets/javascripts/frequent_items/utils.js @@ -35,13 +35,15 @@ export const getTopFrequentItems = (items) => { }; export const updateExistingFrequentItem = (frequentItem, item) => { - const accessedOverHourAgo = - Math.abs(item.lastAccessedOn - frequentItem.lastAccessedOn) / HOUR_IN_MS > 1; + // `frequentItem` comes from localStorage and it's possible it doesn't have a `lastAccessedOn` + const neverAccessed = !frequentItem.lastAccessedOn; + const shouldUpdate = + neverAccessed || Math.abs(item.lastAccessedOn - frequentItem.lastAccessedOn) / HOUR_IN_MS > 1; return { ...item, - frequency: accessedOverHourAgo ? frequentItem.frequency + 1 : frequentItem.frequency, - lastAccessedOn: accessedOverHourAgo ? Date.now() : frequentItem.lastAccessedOn, + frequency: shouldUpdate ? frequentItem.frequency + 1 : frequentItem.frequency, + lastAccessedOn: shouldUpdate ? Date.now() : frequentItem.lastAccessedOn, }; }; diff --git a/app/assets/javascripts/issuable_create/components/issuable_form.vue b/app/assets/javascripts/issuable_create/components/issuable_form.vue index 3cbd5620063..c216a05bdb0 100644 --- a/app/assets/javascripts/issuable_create/components/issuable_form.vue +++ b/app/assets/javascripts/issuable_create/components/issuable_form.vue @@ -72,16 +72,17 @@ export default { :show-suggest-popover="true" :textarea-value="issuableDescription" > - + diff --git a/app/assets/javascripts/members/components/members_tabs.vue b/app/assets/javascripts/members/components/members_tabs.vue index a4bd8ffd708..7c21e33d892 100644 --- a/app/assets/javascripts/members/components/members_tabs.vue +++ b/app/assets/javascripts/members/components/members_tabs.vue @@ -116,7 +116,7 @@ export default { :title-link-attributes="tab.attrs" :query-param-value="tab.queryParamValue" > -