Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services')
-rw-r--r--app/services/ci/stop_environments_service.rb2
-rw-r--r--app/services/snippets/update_service.rb6
2 files changed, 5 insertions, 3 deletions
diff --git a/app/services/ci/stop_environments_service.rb b/app/services/ci/stop_environments_service.rb
index 14ef744ada1..b6c5b398cb1 100644
--- a/app/services/ci/stop_environments_service.rb
+++ b/app/services/ci/stop_environments_service.rb
@@ -28,7 +28,7 @@ module Ci
stop_actions.each do |stop_action|
stop_action.play(stop_action.user)
rescue => e
- Gitlab::ErrorTracking.track_error(e, deployable_id: stop_action.id)
+ Gitlab::ErrorTracking.track_exception(e, deployable_id: stop_action.id)
end
end
diff --git a/app/services/snippets/update_service.rb b/app/services/snippets/update_service.rb
index 2dc9266dbd0..250120c1c19 100644
--- a/app/services/snippets/update_service.rb
+++ b/app/services/snippets/update_service.rb
@@ -85,8 +85,10 @@ module Snippets
end
def snippet_files(snippet)
- [{ previous_path: snippet.file_name_on_repo,
- file_path: params[:file_name],
+ file_name_on_repo = snippet.file_name_on_repo
+
+ [{ previous_path: file_name_on_repo,
+ file_path: params[:file_name] || file_name_on_repo,
content: params[:content] }]
end