From 2df573afed782aebce8c020d92b42e9da7d2868e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 27 Nov 2020 09:09:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/badges/components/badge.vue | 2 +- .../gke_cluster/components/gke_project_id_dropdown.vue | 4 ++-- .../cycle_analytics/components/limit_warning_component.vue | 1 - .../javascripts/diffs/components/diff_expansion_cell.vue | 6 +++--- app/assets/javascripts/diffs/components/diff_file_header.vue | 1 - .../error_tracking/components/stacktrace_entry.vue | 2 +- app/assets/javascripts/groups/components/group_folder.vue | 2 +- .../javascripts/ide/components/file_templates/dropdown.vue | 2 +- app/assets/javascripts/ide/components/jobs/detail.vue | 2 +- .../issue_show/components/fields/description_template.vue | 10 +++------- .../javascripts/issue_show/components/header_actions.vue | 2 +- app/assets/javascripts/notes/components/note_header.vue | 2 +- .../shared/permissions/components/project_feature_setting.vue | 6 +----- .../projects/shared/permissions/components/settings_panel.vue | 2 -- .../pipelines/components/pipelines_list/time_ago.vue | 4 ++-- .../javascripts/related_issues/components/issue_token.vue | 2 +- .../javascripts/repository/components/preview/index.vue | 2 +- .../sidebar/components/assignees/assignee_title.vue | 2 +- .../components/confidential/confidential_issue_sidebar.vue | 11 +++-------- .../sidebar/components/reviewers/reviewer_title.vue | 2 +- .../sidebar/components/subscriptions/subscriptions.vue | 7 +------ app/assets/javascripts/vue_shared/components/awards_list.vue | 6 +++--- .../components/date_time_picker/date_time_picker.vue | 2 +- .../vue_shared/components/dismissible_container.vue | 2 +- .../vue_shared/components/dropdown/dropdown_search_input.vue | 2 +- .../javascripts/vue_shared/components/file_finder/index.vue | 1 - .../components/sidebar/labels_select/dropdown_header.vue | 2 +- app/controllers/graphql_controller.rb | 6 +++++- app/views/projects/commit/_commit_box.html.haml | 2 +- app/views/projects/issues/_new_branch.html.haml | 4 ++-- app/views/projects/merge_requests/_mr_title.html.haml | 4 ++-- 31 files changed, 43 insertions(+), 62 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/badges/components/badge.vue b/app/assets/javascripts/badges/components/badge.vue index 0b8c6aff219..c3512773457 100644 --- a/app/assets/javascripts/badges/components/badge.vue +++ b/app/assets/javascripts/badges/components/badge.vue @@ -84,7 +84,7 @@ export default {
-
{{ s__('Badges|No badge image') }} diff --git a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue index 85d9f0d66ab..522fef423af 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue @@ -179,13 +179,13 @@ export default { 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral' " target="_blank" - >{{ content }}
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue index 0d99a2e8a60..6dc9c71e1cd 100644 --- a/app/assets/javascripts/diffs/components/diff_file_header.vue +++ b/app/assets/javascripts/diffs/components/diff_file_header.vue @@ -221,7 +221,6 @@ export default { ref="collapseIcon" :name="collapseIcon" :size="16" - aria-hidden="true" class="diff-toggle-caret gl-mr-2" @click.stop="handleToggleFile" /> diff --git a/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue b/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue index cd4bb476b6e..c3471346a63 100644 --- a/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue +++ b/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue @@ -80,7 +80,7 @@ export default {
-
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue index e50add3b0a4..acbe94ad143 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue +++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue @@ -341,7 +341,6 @@ export default {
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue index 6e004084077..6d21936791c 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue @@ -114,12 +114,7 @@ export default { class="sidebar-collapsed-icon" @click="onClickCollapsedIcon" > -
diff --git a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue index a7e6438a935..79cdf308ac5 100644 --- a/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue +++ b/app/assets/javascripts/vue_shared/components/date_time_picker/date_time_picker.vue @@ -219,7 +219,7 @@ export default { {{ __('UTC') }} -