diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-05-28 20:01:56 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-05-28 20:01:56 +0900 |
| commit | 1d20679e9c8b1ba16bebaf982255946e7207b4d4 (patch) | |
| tree | 128685af66ca56c751b505a8314ca79dd3b54b34 /app/controllers/projects/boards_controller.rb | |
| parent | 8e92e25b62ca108de775362e6d2981e54535f094 (diff) | |
| parent | 014f5f6a69f63ee42bd94454108268f189b62b18 (diff) | |
| download | gitlab-ce-1d20679e9c8b1ba16bebaf982255946e7207b4d4.tar.gz | |
Merge branch 'master' into per-project-pipeline-iid
Diffstat (limited to 'app/controllers/projects/boards_controller.rb')
| -rw-r--r-- | app/controllers/projects/boards_controller.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb index 949e54ff819..e7354a9e1f7 100644 --- a/app/controllers/projects/boards_controller.rb +++ b/app/controllers/projects/boards_controller.rb @@ -4,22 +4,25 @@ class Projects::BoardsController < Projects::ApplicationController before_action :check_issues_available! before_action :authorize_read_board!, only: [:index, :show] + before_action :boards, only: :index before_action :assign_endpoint_vars def index - @boards = Boards::ListService.new(project, current_user).execute - respond_with_boards end def show - @board = project.boards.find(params[:id]) + @board = boards.find(params[:id]) respond_with_board end private + def boards + @boards ||= Boards::ListService.new(project, current_user).execute + end + def assign_endpoint_vars @boards_endpoint = project_boards_path(project) @bulk_issues_path = bulk_update_project_issues_path(project) |