Remove unnecessary require_relative calls from service classes

artofhuman · artofhuman · commit 724864eeb4b5 · 2016-11-22T11:25:00.000+05:00
Rails by default use autoload for all dirs from app folder.
require_relative not needed. See ActiveSupport::Dependencies.autoload_paths
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,4 @@
+---
+title: 'Remove unnecessary require_relative calls from service classes'
+merge_request: '7601'
+author: Semyon Pupkov

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`##`
`4`	`2`	`# Branch can be deleted either by DeleteBranchService`
`5`	`3`	`# or by GitPushService.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`class CreateBranchService < BaseService`
`4`	`2`	`def execute(branch_name, ref, source_project: @project)`
`5`	`3`	`valid_branch = Gitlab::GitRefValidator.validate(branch_name)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`class CreateDeploymentService < BaseService`
`4`	`2`	`def execute(deployable = nil)`
`5`	`3`	`return unless executable?`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`class CreateReleaseService < BaseService`
`4`	`2`	`def execute(tag_name, release_description)`
`5`	`3`	`repository = project.repository`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`class CreateTagService < BaseService`
`4`	`2`	`def execute(tag_name, target, message, release_description = nil)`
`5`	`3`	`valid_tag = Gitlab::GitRefValidator.validate(tag_name)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`class DeleteBranchService < BaseService`
`4`	`2`	`def execute(branch_name)`
`5`	`3`	`repository = project.repository`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`class DeleteMergedBranchesService < BaseService`
`4`	`2`	`def async_execute`
`5`	`3`	`DeleteMergedBranchesWorker.perform_async(project.id, current_user.id)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`class DeleteTagService < BaseService`
`4`	`2`	`def execute(tag_name)`
`5`	`3`	`repository = project.repository`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative "base_service"`
`2`		`-`
`3`	`1`	`module Files`
`4`	`2`	`class CreateDirService < Files::BaseService`
`5`	`3`	`def commit`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'base_service'`
`2`		`-`
`3`	`1`	`class UpdateReleaseService < BaseService`
`4`	`2`	`def execute(tag_name, release_description)`
`5`	`3`	`repository = project.repository`