From 478b3d64f8cc7a47c5d1fc0507036590417b8aa8 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 7 Oct 2016 16:46:32 -0300
Subject: [PATCH] Remove Boards::BaseService
---
app/services/boards/base_service.rb | 4 ----
app/services/boards/create_service.rb | 2 +-
app/services/boards/issues/create_service.rb | 2 +-
app/services/boards/issues/list_service.rb | 2 +-
app/services/boards/issues/move_service.rb | 2 +-
app/services/boards/list_service.rb | 2 +-
app/services/boards/lists/create_service.rb | 2 +-
app/services/boards/lists/destroy_service.rb | 2 +-
app/services/boards/lists/generate_service.rb | 2 +-
app/services/boards/lists/list_service.rb | 2 +-
app/services/boards/lists/move_service.rb | 2 +-
11 files changed, 10 insertions(+), 14 deletions(-)
delete mode 100644 app/services/boards/base_service.rb
diff --git a/app/services/boards/base_service.rb b/app/services/boards/base_service.rb
deleted file mode 100644
index 7eacacbaf7e..00000000000
--- a/app/services/boards/base_service.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Boards
- class BaseService < ::BaseService
- end
-end
diff --git a/app/services/boards/create_service.rb b/app/services/boards/create_service.rb
index a9dbd76a44a..9bdd7b6f0cf 100644
--- a/app/services/boards/create_service.rb
+++ b/app/services/boards/create_service.rb
@@ -1,5 +1,5 @@
module Boards
- class CreateService < Boards::BaseService
+ class CreateService < BaseService
def execute
if project.boards.empty?
create_board!
diff --git a/app/services/boards/issues/create_service.rb b/app/services/boards/issues/create_service.rb
index a181e74043b..c0d7ff5b585 100644
--- a/app/services/boards/issues/create_service.rb
+++ b/app/services/boards/issues/create_service.rb
@@ -1,6 +1,6 @@
module Boards
module Issues
- class CreateService < Boards::BaseService
+ class CreateService < BaseService
def execute
create_issue(params.merge(label_ids: [list.label_id]))
end
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index 782dbf0db1a..fd4a462c7b2 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -1,6 +1,6 @@
module Boards
module Issues
- class ListService < Boards::BaseService
+ class ListService < BaseService
def execute
issues = IssuesFinder.new(current_user, filter_params).execute
issues = without_board_labels(issues) unless list.movable?
diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb
index 9a16609a8b5..96554a92a02 100644
--- a/app/services/boards/issues/move_service.rb
+++ b/app/services/boards/issues/move_service.rb
@@ -1,6 +1,6 @@
module Boards
module Issues
- class MoveService < Boards::BaseService
+ class MoveService < BaseService
def execute(issue)
return false unless can?(current_user, :update_issue, issue)
return false unless valid_move?
diff --git a/app/services/boards/list_service.rb b/app/services/boards/list_service.rb
index cca4bdd82a2..84f1fc3a4e2 100644
--- a/app/services/boards/list_service.rb
+++ b/app/services/boards/list_service.rb
@@ -1,5 +1,5 @@
module Boards
- class ListService < Boards::BaseService
+ class ListService < BaseService
def execute
create_board! if project.boards.empty?
project.boards
diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb
index da6f59c0399..abc7aeece39 100644
--- a/app/services/boards/lists/create_service.rb
+++ b/app/services/boards/lists/create_service.rb
@@ -1,6 +1,6 @@
module Boards
module Lists
- class CreateService < Boards::BaseService
+ class CreateService < BaseService
def execute(board)
List.transaction do
label = project.labels.find(params[:label_id])
diff --git a/app/services/boards/lists/destroy_service.rb b/app/services/boards/lists/destroy_service.rb
index d75c5fd3dc6..f986e05944c 100644
--- a/app/services/boards/lists/destroy_service.rb
+++ b/app/services/boards/lists/destroy_service.rb
@@ -1,6 +1,6 @@
module Boards
module Lists
- class DestroyService < Boards::BaseService
+ class DestroyService < BaseService
def execute(list)
return false unless list.destroyable?
diff --git a/app/services/boards/lists/generate_service.rb b/app/services/boards/lists/generate_service.rb
index 686e4e4b336..d8048f1c67e 100644
--- a/app/services/boards/lists/generate_service.rb
+++ b/app/services/boards/lists/generate_service.rb
@@ -1,6 +1,6 @@
module Boards
module Lists
- class GenerateService < Boards::BaseService
+ class GenerateService < BaseService
def execute(board)
return false unless board.lists.movable.empty?
diff --git a/app/services/boards/lists/list_service.rb b/app/services/boards/lists/list_service.rb
index ff739bc7d9c..c579ed4c869 100644
--- a/app/services/boards/lists/list_service.rb
+++ b/app/services/boards/lists/list_service.rb
@@ -1,6 +1,6 @@
module Boards
module Lists
- class ListService < Boards::BaseService
+ class ListService < BaseService
def execute(board)
board.lists
end
diff --git a/app/services/boards/lists/move_service.rb b/app/services/boards/lists/move_service.rb
index 7d0730e8332..f2a68865f7b 100644
--- a/app/services/boards/lists/move_service.rb
+++ b/app/services/boards/lists/move_service.rb
@@ -1,6 +1,6 @@
module Boards
module Lists
- class MoveService < Boards::BaseService
+ class MoveService < BaseService
def execute(list)
@board = list.board
@old_position = list.position
--
GitLab