summaryrefslogtreecommitdiff
path: root/app/services/boards
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2017-03-24 23:40:35 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2017-03-24 23:40:35 +1100
commit1fb9de2bf746a32baeb74e57bf7f64525cc8ec3f (patch)
treed4207c0d90713c39977afabe2765806be89bd046 /app/services/boards
parent6eeba4b18214e054bbdebd66f53586fc09256130 (diff)
downloadgitlab-ce-1fb9de2bf746a32baeb74e57bf7f64525cc8ec3f.tar.gz
Change Done column to Closed in issue boards
Diffstat (limited to 'app/services/boards')
-rw-r--r--app/services/boards/create_service.rb2
-rw-r--r--app/services/boards/issues/list_service.rb2
-rw-r--r--app/services/boards/issues/move_service.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/services/boards/create_service.rb b/app/services/boards/create_service.rb
index f6275a63109..fd9ff115eab 100644
--- a/app/services/boards/create_service.rb
+++ b/app/services/boards/create_service.rb
@@ -12,7 +12,7 @@ module Boards
def create_board!
board = project.boards.create
- board.lists.create(list_type: :done)
+ board.lists.create(list_type: :closed)
board
end
diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index cb6d30396ec..533e6787855 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -41,7 +41,7 @@ module Boards
end
def set_state
- params[:state] = list && list.done? ? 'closed' : 'opened'
+ params[:state] = list && list.closed? ? 'closed' : 'opened'
end
def board_label_ids
diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb
index 2a9981ab884..d5735f13c1e 100644
--- a/app/services/boards/issues/move_service.rb
+++ b/app/services/boards/issues/move_service.rb
@@ -48,8 +48,8 @@ module Boards
end
def issue_state
- return 'reopen' if moving_from_list.done?
- return 'close' if moving_to_list.done?
+ return 'reopen' if moving_from_list.closed?
+ return 'close' if moving_to_list.closed?
end
def add_label_ids