From 724864eeb4b520f192c844b7672b497f2a4b8473 Mon Sep 17 00:00:00 2001 From: Semyon Pupkov Date: Sat, 19 Nov 2016 18:32:38 +0500 Subject: [PATCH] Remove unnecessary require_relative calls from service classes Rails by default use autoload for all dirs from app folder. require_relative not needed. See ActiveSupport::Dependencies.autoload_paths --- app/services/after_branch_delete_service.rb | 2 -- app/services/create_branch_service.rb | 2 -- app/services/create_deployment_service.rb | 2 -- app/services/create_release_service.rb | 2 -- app/services/create_tag_service.rb | 2 -- app/services/delete_branch_service.rb | 2 -- app/services/delete_merged_branches_service.rb | 2 -- app/services/delete_tag_service.rb | 2 -- app/services/files/create_dir_service.rb | 2 -- app/services/files/create_service.rb | 2 -- app/services/files/delete_service.rb | 2 -- app/services/files/multi_service.rb | 2 -- app/services/files/update_service.rb | 2 -- app/services/merge_requests/update_service.rb | 4 ---- app/services/update_release_service.rb | 2 -- changelogs/unreleased/remove-require-from-services.yml | 4 ++++ 16 files changed, 4 insertions(+), 32 deletions(-) create mode 100644 changelogs/unreleased/remove-require-from-services.yml diff --git a/app/services/after_branch_delete_service.rb b/app/services/after_branch_delete_service.rb index 2be4d3e6ab5..227e9ea9c6d 100644 --- a/app/services/after_branch_delete_service.rb +++ b/app/services/after_branch_delete_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - ## # Branch can be deleted either by DeleteBranchService # or by GitPushService. diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb index 757fc35a78f..e004a303496 100644 --- a/app/services/create_branch_service.rb +++ b/app/services/create_branch_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - class CreateBranchService < BaseService def execute(branch_name, ref, source_project: @project) valid_branch = Gitlab::GitRefValidator.validate(branch_name) diff --git a/app/services/create_deployment_service.rb b/app/services/create_deployment_service.rb index 8ae15ad32f4..47f9b2c621c 100644 --- a/app/services/create_deployment_service.rb +++ b/app/services/create_deployment_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - class CreateDeploymentService < BaseService def execute(deployable = nil) return unless executable? diff --git a/app/services/create_release_service.rb b/app/services/create_release_service.rb index d6d4afcf29a..54ff1f74126 100644 --- a/app/services/create_release_service.rb +++ b/app/services/create_release_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - class CreateReleaseService < BaseService def execute(tag_name, release_description) repository = project.repository diff --git a/app/services/create_tag_service.rb b/app/services/create_tag_service.rb index c0e7ecf6a96..fe9353afeb8 100644 --- a/app/services/create_tag_service.rb +++ b/app/services/create_tag_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - class CreateTagService < BaseService def execute(tag_name, target, message, release_description = nil) valid_tag = Gitlab::GitRefValidator.validate(tag_name) diff --git a/app/services/delete_branch_service.rb b/app/services/delete_branch_service.rb index 3e5dd4ebb86..11a045f4c31 100644 --- a/app/services/delete_branch_service.rb +++ b/app/services/delete_branch_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - class DeleteBranchService < BaseService def execute(branch_name) repository = project.repository diff --git a/app/services/delete_merged_branches_service.rb b/app/services/delete_merged_branches_service.rb index 8b8deafedb7..1b5623baebe 100644 --- a/app/services/delete_merged_branches_service.rb +++ b/app/services/delete_merged_branches_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - class DeleteMergedBranchesService < BaseService def async_execute DeleteMergedBranchesWorker.perform_async(project.id, current_user.id) diff --git a/app/services/delete_tag_service.rb b/app/services/delete_tag_service.rb index d824406cb49..a44dee14a0f 100644 --- a/app/services/delete_tag_service.rb +++ b/app/services/delete_tag_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - class DeleteTagService < BaseService def execute(tag_name) repository = project.repository diff --git a/app/services/files/create_dir_service.rb b/app/services/files/create_dir_service.rb index d00d78cee7e..e5b4d60e467 100644 --- a/app/services/files/create_dir_service.rb +++ b/app/services/files/create_dir_service.rb @@ -1,5 +1,3 @@ -require_relative "base_service" - module Files class CreateDirService < Files::BaseService def commit diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb index bf127843d55..b23576b9a28 100644 --- a/app/services/files/create_service.rb +++ b/app/services/files/create_service.rb @@ -1,5 +1,3 @@ -require_relative "base_service" - module Files class CreateService < Files::BaseService def commit diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb index 8b27ad51789..4f7e7a5baaa 100644 --- a/app/services/files/delete_service.rb +++ b/app/services/files/delete_service.rb @@ -1,5 +1,3 @@ -require_relative "base_service" - module Files class DeleteService < Files::BaseService def commit diff --git a/app/services/files/multi_service.rb b/app/services/files/multi_service.rb index d28912e1301..54446e90007 100644 --- a/app/services/files/multi_service.rb +++ b/app/services/files/multi_service.rb @@ -1,5 +1,3 @@ -require_relative "base_service" - module Files class MultiService < Files::BaseService class FileChangedError < StandardError; end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index c17fdb8d1f1..47a18e3e132 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -1,5 +1,3 @@ -require_relative "base_service" - module Files class UpdateService < Files::BaseService class FileChangedError < StandardError; end diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index a37cc3fdf21..fda0da19d87 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -1,7 +1,3 @@ -require_relative 'base_service' -require_relative 'reopen_service' -require_relative 'close_service' - module MergeRequests class UpdateService < MergeRequests::BaseService def execute(merge_request) diff --git a/app/services/update_release_service.rb b/app/services/update_release_service.rb index 0ee1ff2d7d9..b7c36651968 100644 --- a/app/services/update_release_service.rb +++ b/app/services/update_release_service.rb @@ -1,5 +1,3 @@ -require_relative 'base_service' - class UpdateReleaseService < BaseService def execute(tag_name, release_description) repository = project.repository diff --git a/changelogs/unreleased/remove-require-from-services.yml b/changelogs/unreleased/remove-require-from-services.yml new file mode 100644 index 00000000000..400512e0314 --- /dev/null +++ b/changelogs/unreleased/remove-require-from-services.yml @@ -0,0 +1,4 @@ +--- +title: 'Remove unnecessary require_relative calls from service classes' +merge_request: '7601' +author: Semyon Pupkov