Commit 8eea4504 authored by Micaël Bergeron's avatar Micaël Bergeron

Resolve conflict in app/controllers/boards/issues_controller.rb

parent 313f7903
...@@ -12,11 +12,7 @@ module Boards ...@@ -12,11 +12,7 @@ module Boards
def index def index
issues = Boards::Issues::ListService.new(board_parent, current_user, filter_params).execute issues = Boards::Issues::ListService.new(board_parent, current_user, filter_params).execute
issues = issues.page(params[:page]).per(params[:per] || 20) issues = issues.page(params[:page]).per(params[:per] || 20)
<<<<<<< HEAD
make_sure_position_is_set(issues) unless Gitlab::Geo.secondary? make_sure_position_is_set(issues) unless Gitlab::Geo.secondary?
=======
make_sure_position_is_set(issues)
>>>>>>> ce-com/master
issues = issues.preload(:project, issues = issues.preload(:project,
:milestone, :milestone,
:assignees, :assignees,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment