From 145295d7b3390c14bd5766ae95f00c4acf290f23 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 6 Aug 2020 06:09:38 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/groups/transfer_service.rb | 4 +--- app/services/jira_import/start_import_service.rb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb index 22d7a0a99db..2bd571f60af 100644 --- a/app/services/groups/transfer_service.rb +++ b/app/services/groups/transfer_service.rb @@ -55,9 +55,7 @@ module Groups npm_packages = ::Packages::GroupPackagesFinder.new(current_user, group, package_type: :npm).execute - return true if different_root_ancestor? && npm_packages.exists? - - false + different_root_ancestor? && npm_packages.exists? end def different_root_ancestor? diff --git a/app/services/jira_import/start_import_service.rb b/app/services/jira_import/start_import_service.rb index f85f686c61a..88cfe684125 100644 --- a/app/services/jira_import/start_import_service.rb +++ b/app/services/jira_import/start_import_service.rb @@ -42,7 +42,7 @@ module JiraImport ServiceResponse.success(payload: { import_data: jira_import } ) rescue => ex - # in case project.save! raises an erorr + # in case project.save! raises an error Gitlab::ErrorTracking.track_exception(ex, project_id: project.id) jira_import&.do_fail!(error_message: ex.message) build_error_response(ex.message) -- cgit v1.2.1