diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 15:07:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 15:07:45 +0000 |
commit | f1a40d0db939dfe8ff95d385e652ff72566be765 (patch) | |
tree | cdca36cb171cdffff2739c37c23e74914e57a836 /app/services/test_hooks | |
parent | ac1dca43baa7b3b1ac7d60d89ad60fdeefed0b80 (diff) | |
download | gitlab-ce-f1a40d0db939dfe8ff95d385e652ff72566be765.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/test_hooks')
-rw-r--r-- | app/services/test_hooks/base_service.rb | 2 | ||||
-rw-r--r-- | app/services/test_hooks/project_service.rb | 14 | ||||
-rw-r--r-- | app/services/test_hooks/system_service.rb | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/services/test_hooks/base_service.rb b/app/services/test_hooks/base_service.rb index 8b5439c00bf..ebebf29c28b 100644 --- a/app/services/test_hooks/base_service.rb +++ b/app/services/test_hooks/base_service.rb @@ -18,7 +18,7 @@ module TestHooks return error('Testing not available for this hook') end - error_message = catch(:validation_error) do + error_message = catch(:validation_error) do # rubocop:disable Cop/BanCatchThrow sample_data = self.__send__(trigger_data_method) # rubocop:disable GitlabSecurity/PublicSend return hook.execute(sample_data, trigger_key) # rubocop:disable Cop/AvoidReturnFromBlocks diff --git a/app/services/test_hooks/project_service.rb b/app/services/test_hooks/project_service.rb index a71278e8b8b..aa80cc928b9 100644 --- a/app/services/test_hooks/project_service.rb +++ b/app/services/test_hooks/project_service.rb @@ -11,7 +11,7 @@ module TestHooks private def push_events_data - throw(:validation_error, s_('TestHooks|Ensure the project has at least one commit.')) if project.empty_repo? + throw(:validation_error, s_('TestHooks|Ensure the project has at least one commit.')) if project.empty_repo? # rubocop:disable Cop/BanCatchThrow Gitlab::DataBuilder::Push.build_sample(project, current_user) end @@ -20,14 +20,14 @@ module TestHooks def note_events_data note = project.notes.first - throw(:validation_error, s_('TestHooks|Ensure the project has notes.')) unless note.present? + throw(:validation_error, s_('TestHooks|Ensure the project has notes.')) unless note.present? # rubocop:disable Cop/BanCatchThrow Gitlab::DataBuilder::Note.build(note, current_user) end def issues_events_data issue = project.issues.first - throw(:validation_error, s_('TestHooks|Ensure the project has issues.')) unless issue.present? + throw(:validation_error, s_('TestHooks|Ensure the project has issues.')) unless issue.present? # rubocop:disable Cop/BanCatchThrow issue.to_hook_data(current_user) end @@ -36,21 +36,21 @@ module TestHooks def merge_requests_events_data merge_request = project.merge_requests.first - throw(:validation_error, s_('TestHooks|Ensure the project has merge requests.')) unless merge_request.present? + throw(:validation_error, s_('TestHooks|Ensure the project has merge requests.')) unless merge_request.present? # rubocop:disable Cop/BanCatchThrow merge_request.to_hook_data(current_user) end def job_events_data build = project.builds.first - throw(:validation_error, s_('TestHooks|Ensure the project has CI jobs.')) unless build.present? + throw(:validation_error, s_('TestHooks|Ensure the project has CI jobs.')) unless build.present? # rubocop:disable Cop/BanCatchThrow Gitlab::DataBuilder::Build.build(build) end def pipeline_events_data pipeline = project.ci_pipelines.first - throw(:validation_error, s_('TestHooks|Ensure the project has CI pipelines.')) unless pipeline.present? + throw(:validation_error, s_('TestHooks|Ensure the project has CI pipelines.')) unless pipeline.present? # rubocop:disable Cop/BanCatchThrow Gitlab::DataBuilder::Pipeline.build(pipeline) end @@ -58,7 +58,7 @@ module TestHooks def wiki_page_events_data page = project.wiki.list_pages(limit: 1).first if !project.wiki_enabled? || page.blank? - throw(:validation_error, s_('TestHooks|Ensure the wiki is enabled and has pages.')) + throw(:validation_error, s_('TestHooks|Ensure the wiki is enabled and has pages.')) # rubocop:disable Cop/BanCatchThrow end Gitlab::DataBuilder::WikiPage.build(page, current_user, 'create') diff --git a/app/services/test_hooks/system_service.rb b/app/services/test_hooks/system_service.rb index fedf9c6799b..5c7961f417d 100644 --- a/app/services/test_hooks/system_service.rb +++ b/app/services/test_hooks/system_service.rb @@ -18,7 +18,7 @@ module TestHooks def merge_requests_events_data merge_request = MergeRequest.of_projects(current_user.projects.select(:id)).first - throw(:validation_error, s_('TestHooks|Ensure one of your projects has merge requests.')) unless merge_request.present? + throw(:validation_error, s_('TestHooks|Ensure one of your projects has merge requests.')) unless merge_request.present? # rubocop:disable Cop/BanCatchThrow merge_request.to_hook_data(current_user) end |