summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-30 08:58:15 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-30 08:58:15 +0000
commit85418f9ae8df980ce518247deddded23c16bbc7f (patch)
treebb15be96c8cd76154c0b0a3ea52eac3e500946f9
parenta49d37ee41442e94179b9d378b8ff96d07c3f7ca (diff)
parent455e7a2fa1bcbc06825f9f3414ee63fcba920412 (diff)
downloadgitlab-ce-85418f9ae8df980ce518247deddded23c16bbc7f.tar.gz
Merge branch 'osw-order-boards-by-name' into 'master'
[Backport] Order boards dropdown alphabetically See merge request gitlab-org/gitlab-ce!18065
-rw-r--r--app/services/boards/list_service.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/boards/list_service.rb b/app/services/boards/list_service.rb
index 6d0dd0a9f99..9269b8d2620 100644
--- a/app/services/boards/list_service.rb
+++ b/app/services/boards/list_service.rb
@@ -2,11 +2,15 @@ module Boards
class ListService < Boards::BaseService
def execute
create_board! if parent.boards.empty?
- parent.boards
+ boards
end
private
+ def boards
+ parent.boards
+ end
+
def create_board!
Boards::CreateService.new(parent, current_user).execute
end