diff options
Diffstat (limited to 'app/services/metrics')
3 files changed, 5 insertions, 5 deletions
diff --git a/app/services/metrics/dashboard/grafana_metric_embed_service.rb b/app/services/metrics/dashboard/grafana_metric_embed_service.rb index 6069d236e82..e94c8d92c3a 100644 --- a/app/services/metrics/dashboard/grafana_metric_embed_service.rb +++ b/app/services/metrics/dashboard/grafana_metric_embed_service.rb @@ -80,7 +80,7 @@ module Metrics def fetch_dashboard uid = GrafanaUidParser.new(grafana_url, project).parse - raise DashboardProcessingError.new(_('Dashboard uid not found')) unless uid + raise DashboardProcessingError, _('Dashboard uid not found') unless uid response = client.get_dashboard(uid: uid) @@ -89,7 +89,7 @@ module Metrics def fetch_datasource(dashboard) name = DatasourceNameParser.new(grafana_url, dashboard).parse - raise DashboardProcessingError.new(_('Datasource name not found')) unless name + raise DashboardProcessingError, _('Datasource name not found') unless name response = client.get_datasource(name: name) @@ -115,7 +115,7 @@ module Metrics def parse_json(json) Gitlab::Json.parse(json, symbolize_names: true) rescue JSON::ParserError - raise DashboardProcessingError.new(_('Grafana response contains invalid json')) + raise DashboardProcessingError, _('Grafana response contains invalid json') end end diff --git a/app/services/metrics/dashboard/transient_embed_service.rb b/app/services/metrics/dashboard/transient_embed_service.rb index 0a9c4bc7b86..29ea9909a36 100644 --- a/app/services/metrics/dashboard/transient_embed_service.rb +++ b/app/services/metrics/dashboard/transient_embed_service.rb @@ -39,7 +39,7 @@ module Metrics end def invalid_embed_json!(message) - raise DashboardProcessingError.new(_("Parsing error for param :embed_json. %{message}") % { message: message }) + raise DashboardProcessingError, _("Parsing error for param :embed_json. %{message}") % { message: message } end end end diff --git a/app/services/metrics/dashboard/update_dashboard_service.rb b/app/services/metrics/dashboard/update_dashboard_service.rb index d990e96ecb5..0574cb15e96 100644 --- a/app/services/metrics/dashboard/update_dashboard_service.rb +++ b/app/services/metrics/dashboard/update_dashboard_service.rb @@ -58,7 +58,7 @@ module Metrics target_branch: project.default_branch, title: params[:commit_message] } - merge_request = ::MergeRequests::CreateService.new(project, current_user, merge_request_params).execute + merge_request = ::MergeRequests::CreateService.new(project: project, current_user: current_user, params: merge_request_params).execute if merge_request.persisted? success(result.merge(merge_request: Gitlab::UrlBuilder.build(merge_request))) |