diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 18:09:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 18:09:36 +0300 |
commit | 074d013e1eb3f6e0c27f96a3be8b9361254c8a98 (patch) | |
tree | f185c474ddc8624a4793c84b0b1f4cc07349694b /app/services | |
parent | 8f9beefac3774b30e911fb00a68f4c7a5244cf27 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/issuable/clone/attributes_rewriter.rb | 2 | ||||
-rw-r--r-- | app/services/metrics/dashboard/clone_dashboard_service.rb | 4 | ||||
-rw-r--r-- | app/services/metrics/dashboard/custom_dashboard_service.rb (renamed from app/services/metrics/dashboard/project_dashboard_service.rb) | 2 | ||||
-rw-r--r-- | app/services/metrics/dashboard/update_dashboard_service.rb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/services/issuable/clone/attributes_rewriter.rb b/app/services/issuable/clone/attributes_rewriter.rb index 135ab011d69..55f5629baac 100644 --- a/app/services/issuable/clone/attributes_rewriter.rb +++ b/app/services/issuable/clone/attributes_rewriter.rb @@ -74,7 +74,7 @@ module Issuable if matching_destination_milestone.present? event.attributes - .except('id', 'reference', 'reference_html') + .except('id') .merge(entity_key => new_entity.id, 'milestone_id' => matching_destination_milestone.id, 'action' => ResourceMilestoneEvent.actions[event.action], diff --git a/app/services/metrics/dashboard/clone_dashboard_service.rb b/app/services/metrics/dashboard/clone_dashboard_service.rb index c31d6d326e3..ee5b50aefc3 100644 --- a/app/services/metrics/dashboard/clone_dashboard_service.rb +++ b/app/services/metrics/dashboard/clone_dashboard_service.rb @@ -6,7 +6,7 @@ module Metrics module Dashboard class CloneDashboardService < ::BaseService ALLOWED_FILE_TYPE = '.yml' - USER_DASHBOARDS_DIR = ::Metrics::Dashboard::ProjectDashboardService::DASHBOARD_ROOT + USER_DASHBOARDS_DIR = ::Metrics::Dashboard::CustomDashboardService::DASHBOARD_ROOT class << self def allowed_dashboard_templates @@ -52,7 +52,7 @@ module Metrics def dashboard_details { path: new_dashboard_path, - display_name: ::Metrics::Dashboard::ProjectDashboardService.name_for_path(new_dashboard_path), + display_name: ::Metrics::Dashboard::CustomDashboardService.name_for_path(new_dashboard_path), default: false, system_dashboard: false } diff --git a/app/services/metrics/dashboard/project_dashboard_service.rb b/app/services/metrics/dashboard/custom_dashboard_service.rb index fadbe0fae01..77173813a4f 100644 --- a/app/services/metrics/dashboard/project_dashboard_service.rb +++ b/app/services/metrics/dashboard/custom_dashboard_service.rb @@ -5,7 +5,7 @@ # Use Gitlab::Metrics::Dashboard::Finder to retrive dashboards. module Metrics module Dashboard - class ProjectDashboardService < ::Metrics::Dashboard::BaseService + class CustomDashboardService < ::Metrics::Dashboard::BaseService DASHBOARD_ROOT = ".gitlab/dashboards" class << self diff --git a/app/services/metrics/dashboard/update_dashboard_service.rb b/app/services/metrics/dashboard/update_dashboard_service.rb index 25a727ad44c..d37d06a0222 100644 --- a/app/services/metrics/dashboard/update_dashboard_service.rb +++ b/app/services/metrics/dashboard/update_dashboard_service.rb @@ -7,7 +7,7 @@ module Metrics include Stepable ALLOWED_FILE_TYPE = '.yml' - USER_DASHBOARDS_DIR = ::Metrics::Dashboard::ProjectDashboardService::DASHBOARD_ROOT + USER_DASHBOARDS_DIR = ::Metrics::Dashboard::CustomDashboardService::DASHBOARD_ROOT steps :check_push_authorized, :check_branch_name, @@ -117,7 +117,7 @@ module Metrics def dashboard_details { path: update_dashboard_path, - display_name: ::Metrics::Dashboard::ProjectDashboardService.name_for_path(update_dashboard_path), + display_name: ::Metrics::Dashboard::CustomDashboardService.name_for_path(update_dashboard_path), default: false, system_dashboard: false } |