From c6ee7ef0f577e0155740d022babdc1b2b0e28d87 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 28 Jan 2021 15:09:06 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/api.js | 4 +- .../components/diff_discussion_reply.vue | 9 - .../diffs/components/diff_line_note_form.vue | 10 - app/assets/javascripts/header.js | 6 +- .../components/issuable_item.vue | 6 + .../components/issuable_list_root.vue | 2 +- .../components/issuable_tabs.vue | 7 +- app/assets/javascripts/notes.js | 13 +- .../notes/components/comment_form.vue | 11 - .../notes/components/noteable_discussion.vue | 41 +-- .../pages/projects/blame/show/index.js | 2 +- app/assets/stylesheets/framework/diffs.scss | 4 - app/assets/stylesheets/framework/files.scss | 6 - app/assets/stylesheets/framework/filters.scss | 9 + .../stylesheets/framework/variables.scss | 1 - app/assets/stylesheets/pages/issues.scss | 12 +- app/assets/stylesheets/pages/note_form.scss | 6 +- app/assets/stylesheets/pages/notes.scss | 26 -- .../groups/import_export/export_service.rb | 48 +-- .../groups/import_export/import_service.rb | 50 +-- app/services/jira/requests/base.rb | 8 +- .../quick_actions/interpret_service.rb | 9 + app/views/discussions/_notes.html.haml | 2 - app/views/shared/notes/_edit_form.html.haml | 2 +- .../shared/notes/_notes_with_form.html.haml | 3 - .../292391-quickactions-usage-ping.yml | 5 + ...84402-remove-avatar-from-comment-forms.yml | 5 + .../jira_issues_show_integration.yml | 8 + .../usage_data_track_quickactions.yml | 8 + doc/administration/file_hooks.md | 27 +- doc/administration/git_annex.md | 18 +- doc/administration/lfs/index.md | 86 +++-- doc/administration/pages/source.md | 2 +- doc/development/code_review.md | 7 +- doc/integration/README.md | 4 +- .../gmail_action_buttons_for_gitlab.md | 8 +- .../img/oauth_provider_application_form.png | Bin 12553 -> 0 bytes .../oauth_provider_application_id_secret.png | Bin 15280 -> 0 bytes .../oauth_provider_authorized_application.png | Bin 14657 -> 0 bytes .../oauth_provider_user_wide_applications.png | Bin 17526 -> 0 bytes doc/integration/jenkins_deprecated.md | 2 +- doc/integration/jira_development_panel.md | 56 +-- doc/integration/oauth_provider.md | 82 ++--- doc/integration/omniauth.md | 27 +- doc/integration/openid_connect_provider.md | 3 +- doc/push_rules/push_rules.md | 58 ++-- doc/topics/git/troubleshooting_git.md | 21 +- doc/topics/gitlab_flow.md | 80 +++-- .../import_export/group/tree_restorer.rb | 2 +- lib/gitlab/import_export/repo_saver.rb | 3 +- .../known_events/quickactions.yml | 326 ++++++++++++++++++ .../quick_action_activity_unique_counter.rb | 88 +++++ .../migration/add_limit_to_text_columns.rb | 31 +- rubocop/migration_helpers.rb | 2 +- .../application_experiment_spec.rb | 6 + spec/frontend/api_spec.js | 22 ++ .../components/issuable_item_spec.js | 17 + .../notes/components/comment_form_spec.js | 9 - .../states/mr_widget_pipeline_blocked_spec.js | 26 +- .../import_export/group/tree_restorer_spec.rb | 1 + .../gitlab/import_export/repo_saver_spec.rb | 8 + .../hll_redis_counter_spec.rb | 3 +- ...ick_action_activity_unique_counter_spec.rb | 163 +++++++++ spec/lib/gitlab/utils/markdown_spec.rb | 38 +- .../add_limit_to_text_columns_spec.rb | 18 + .../import_export/export_service_spec.rb | 10 + .../quick_actions/interpret_service_spec.rb | 18 + spec/support/gitlab_experiment.rb | 9 + 68 files changed, 1129 insertions(+), 475 deletions(-) create mode 100644 changelogs/unreleased/292391-quickactions-usage-ping.yml create mode 100644 changelogs/unreleased/84402-remove-avatar-from-comment-forms.yml create mode 100644 config/feature_flags/development/jira_issues_show_integration.yml create mode 100644 config/feature_flags/development/usage_data_track_quickactions.yml delete mode 100644 doc/integration/img/oauth_provider_application_form.png delete mode 100644 doc/integration/img/oauth_provider_application_id_secret.png delete mode 100644 doc/integration/img/oauth_provider_authorized_application.png delete mode 100644 doc/integration/img/oauth_provider_user_wide_applications.png create mode 100644 lib/gitlab/usage_data_counters/known_events/quickactions.yml create mode 100644 lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb create mode 100644 spec/lib/gitlab/usage_data_counters/quick_action_activity_unique_counter_spec.rb diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 7043da5017d..e8d433d36c9 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -179,9 +179,9 @@ const Api = { }); }, - groupLabels(namespace) { + groupLabels(namespace, options = {}) { const url = Api.buildUrl(Api.groupLabelsPath).replace(':namespace_path', namespace); - return axios.get(url).then(({ data }) => data); + return axios.get(url, options).then(({ data }) => data); }, // Return namespaces list. Filtered by query diff --git a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue index 531ebaddacd..a7a6b38235b 100644 --- a/app/assets/javascripts/diffs/components/diff_discussion_reply.vue +++ b/app/assets/javascripts/diffs/components/diff_discussion_reply.vue @@ -2,14 +2,12 @@ import { mapGetters } from 'vuex'; import NoteSignedOutWidget from '~/notes/components/note_signed_out_widget.vue'; import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; export default { name: 'DiffDiscussionReply', components: { NoteSignedOutWidget, ReplyPlaceholder, - UserAvatarLink, }, props: { hasForm: { @@ -36,13 +34,6 @@ export default {