diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 03:08:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 03:08:50 +0300 |
commit | ced6c9ae9a9a80c884cafbea9c717b578dfac326 (patch) | |
tree | 7cb0e78e0639df4b2b79be94ddae77c304bd3357 /app | |
parent | 02c3b2af448be6a5004e8d833cbcbf8e5f185210 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
10 files changed, 27 insertions, 33 deletions
diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue index 5564bca6df0..b480cf098f2 100644 --- a/app/assets/javascripts/batch_comments/components/draft_note.vue +++ b/app/assets/javascripts/batch_comments/components/draft_note.vue @@ -3,7 +3,6 @@ import { mapActions, mapGetters, mapState } from 'vuex'; import { GlButton } from '@gitlab/ui'; import NoteableNote from '~/notes/components/noteable_note.vue'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import PublishButton from './publish_button.vue'; export default { @@ -12,7 +11,6 @@ export default { PublishButton, GlButton, }, - mixins: [glFeatureFlagsMixin()], props: { draft: { type: Object, @@ -63,14 +61,14 @@ export default { this.isEditingDraft = false; }, handleMouseEnter(draft) { - if (this.glFeatures.multilineComments && draft.position) { + if (draft.position) { this.setSelectedCommentPositionHover(draft.position.line_range); } }, handleMouseLeave(draft) { - // Even though position isn't used here we still don't want to unecessarily call a mutation + // Even though position isn't used here we still don't want to unnecessarily call a mutation // The lack of position tells us that highlighting is irrelevant in this context - if (this.glFeatures.multilineComments && draft.position) { + if (draft.position) { this.setSelectedCommentPositionHover(); } }, diff --git a/app/assets/javascripts/batch_comments/components/preview_item.vue b/app/assets/javascripts/batch_comments/components/preview_item.vue index 589734df795..7f3892ae066 100644 --- a/app/assets/javascripts/batch_comments/components/preview_item.vue +++ b/app/assets/javascripts/batch_comments/components/preview_item.vue @@ -3,7 +3,6 @@ import { mapGetters } from 'vuex'; import { GlSprintf, GlIcon } from '@gitlab/ui'; import { IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants'; import { sprintf, __ } from '~/locale'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { getStartLineNumber, getEndLineNumber, @@ -16,7 +15,7 @@ export default { GlIcon, GlSprintf, }, - mixins: [resolvedStatusMixin, glFeatureFlagsMixin()], + mixins: [resolvedStatusMixin], props: { draft: { type: Object, @@ -71,6 +70,10 @@ export default { return this.draft.position || this.discussion.position; }, startLineNumber() { + if (this.position?.position_type === IMAGE_DIFF_POSITION_TYPE) { + // eslint-disable-next-line @gitlab/require-i18n-strings + return `${this.position.x}x ${this.position.y}y`; + } return getStartLineNumber(this.position?.line_range); }, endLineNumber() { @@ -90,16 +93,12 @@ export default { <span> <span class="review-preview-item-header"> <gl-icon class="flex-shrink-0" :name="iconName" /> - <span - class="bold text-nowrap" - :class="{ 'gl-align-items-center': glFeatures.multilineComments }" - > + <span class="bold text-nowrap gl-align-items-center"> <span class="review-preview-item-header-text block-truncated"> {{ titleText }} </span> <template v-if="showLinePosition"> - <template v-if="!glFeatures.multilineComments">:{{ linePosition }}</template> - <template v-else-if="startLineNumber === endLineNumber"> + <template v-if="startLineNumber === endLineNumber"> :<span :class="getLineClasses(startLineNumber)">{{ startLineNumber }}</span> </template> <gl-sprintf v-else :message="__(':%{startLine} to %{endLine}')"> diff --git a/app/assets/javascripts/diffs/components/diff_line_note_form.vue b/app/assets/javascripts/diffs/components/diff_line_note_form.vue index e4c64bb0e07..4908d600e4f 100644 --- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue +++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue @@ -165,7 +165,7 @@ export default { <template> <div class="content discussion-form discussion-form-container discussion-notes"> - <div v-if="glFeatures.multilineComments" class="gl-mb-3 gl-text-gray-500 gl-pb-3"> + <div class="gl-mb-3 gl-text-gray-500 gl-pb-3"> <multiline-comment-form v-model="commentLineStart" :line="line" diff --git a/app/assets/javascripts/notes/components/discussion_notes.vue b/app/assets/javascripts/notes/components/discussion_notes.vue index fc82f8e6b89..2d74bd8f74b 100644 --- a/app/assets/javascripts/notes/components/discussion_notes.vue +++ b/app/assets/javascripts/notes/components/discussion_notes.vue @@ -4,7 +4,6 @@ import { __ } from '~/locale'; import PlaceholderNote from '~/vue_shared/components/notes/placeholder_note.vue'; import PlaceholderSystemNote from '~/vue_shared/components/notes/placeholder_system_note.vue'; import SystemNote from '~/vue_shared/components/notes/system_note.vue'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { SYSTEM_NOTE } from '../constants'; import NoteableNote from './noteable_note.vue'; import ToggleRepliesWidget from './toggle_replies_widget.vue'; @@ -18,7 +17,6 @@ export default { NoteEditedText, DiscussionNotesRepliesWrapper, }, - mixins: [glFeatureFlagsMixin()], props: { discussion: { type: Object, @@ -96,14 +94,14 @@ export default { return note.isPlaceholderNote ? note.notes[0] : note; }, handleMouseEnter(discussion) { - if (this.glFeatures.multilineComments && discussion.position) { + if (discussion.position) { this.setSelectedCommentPositionHover(discussion.position.line_range); } }, handleMouseLeave(discussion) { - // Even though position isn't used here we still don't want to unecessarily call a mutation + // Even though position isn't used here we still don't want to unnecessarily call a mutation // The lack of position tells us that highlighting is irrelevant in this context - if (this.glFeatures.multilineComments && discussion.position) { + if (discussion.position) { this.setSelectedCommentPositionHover(); } }, diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 22941857f93..2eee932b5cc 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -3,7 +3,6 @@ import $ from 'jquery'; import { mapGetters, mapActions } from 'vuex'; import { escape } from 'lodash'; import { GlSprintf, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { truncateSha } from '~/lib/utils/text_utility'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import httpStatusCodes from '~/lib/utils/http_status'; @@ -38,7 +37,7 @@ export default { directives: { SafeHtml, }, - mixins: [noteable, resolvable, glFeatureFlagsMixin()], + mixins: [noteable, resolvable], props: { note: { type: Object, @@ -160,7 +159,6 @@ export default { }, showMultiLineComment() { if ( - !this.glFeatures.multilineComments || !this.discussionRoot || this.startLineNumber.length === 0 || this.endLineNumber.length === 0 diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js index 59aa634872f..6b9506c6dfa 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_edit.js +++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js @@ -1,4 +1,4 @@ -import { __ } from '~/locale'; +import { s__ } from '~/locale'; import { deprecatedCreateFlash as flash } from '../flash'; import axios from '../lib/utils/axios_utils'; import ProtectedTagAccessDropdown from './protected_tag_access_dropdown'; @@ -48,11 +48,8 @@ export default class ProtectedTagEdit { .catch(() => { this.$allowedToCreateDropdownButton.enable(); - flash( - __('Failed to update tag!'), - 'alert', - document.querySelector('.js-protected-tags-list'), - ); + window.scrollTo({ top: 0, behavior: 'smooth' }); + flash(s__('ProjectSettings|Failed to update tag!')); }); } } diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss index 89713fdbbea..92405c00c5e 100644 --- a/app/assets/stylesheets/framework/tables.scss +++ b/app/assets/stylesheets/framework/tables.scss @@ -69,9 +69,6 @@ table { } } - td { - border-color: $white-normal; - } } .thead-white { diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index efbb958cbae..c30fc0f5a73 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -30,7 +30,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action :authenticate_user!, only: [:assign_related_issues] before_action :check_user_can_push_to_source_branch!, only: [:rebase] before_action only: [:show] do - push_frontend_feature_flag(:multiline_comments, @project, default_enabled: true) push_frontend_feature_flag(:file_identifier_hash) push_frontend_feature_flag(:batch_suggestions, @project, default_enabled: true) push_frontend_feature_flag(:approvals_commented_by, @project, default_enabled: true) diff --git a/app/services/ci/create_job_artifacts_service.rb b/app/services/ci/create_job_artifacts_service.rb index 5efb3805bf7..f1fdc8e2490 100644 --- a/app/services/ci/create_job_artifacts_service.rb +++ b/app/services/ci/create_job_artifacts_service.rb @@ -7,6 +7,7 @@ module Ci ArtifactsExistError = Class.new(StandardError) LSIF_ARTIFACT_TYPE = 'lsif' + METRICS_REPORT_UPLOAD_EVENT_NAME = 'i_testing_metrics_report_artifact_uploaders' OBJECT_STORAGE_ERRORS = [ Errno::EIO, @@ -42,6 +43,8 @@ module Ci artifact, artifact_metadata = build_artifact(artifacts_file, params, metadata_file) result = parse_artifact(artifact) + track_artifact_uploader(artifact) + return result unless result[:status] == :success persist_artifact(artifact, artifact_metadata, params) @@ -152,6 +155,12 @@ module Ci ) end + def track_artifact_uploader(artifact) + return unless artifact.file_type == 'metrics' + + track_usage_event(METRICS_REPORT_UPLOAD_EVENT_NAME, @job.user_id) + end + def parse_dotenv_artifact(artifact) Ci::ParseDotenvArtifactService.new(project, current_user).execute(artifact) end diff --git a/app/views/projects/protected_tags/shared/_tags_list.html.haml b/app/views/projects/protected_tags/shared/_tags_list.html.haml index a5a43072744..f3cf4013898 100644 --- a/app/views/projects/protected_tags/shared/_tags_list.html.haml +++ b/app/views/projects/protected_tags/shared/_tags_list.html.haml @@ -23,7 +23,6 @@ %th %tbody %tr - %td.flash-container{ colspan: 4 } = yield = paginate @protected_tags, theme: 'gitlab' |