resolve some conflicts

changelogs/unreleased-ee/3562-issue-links.yml

+---
+title: Fix base link for issues on group boards
+merge_request:
+author:
+type: fixed

ee/app/helpers/ee/boards_helper.rb

@@ -18,7 +18,7 @@ module EE
     def build_issue_link_base
       return super unless @board.group_board?
 
-      "/#{@board.group.path}/:project_path/issues"
+      "#{group_path(@board.group)}/:project_path/issues"
     end
 
     def board_base_url

spec/helpers/boards_helper_spec.rb

+require 'spec_helper'
+
+describe BoardsHelper do
+  describe '#build_issue_link_base' do
+    it 'returns correct path for project board' do
+      @project = create(:project)
+      @board = create(:board, project: @project)
+
+      expect(build_issue_link_base).to eq("/#{@project.namespace.path}/#{@project.path}/issues")
+    end
+
+    context 'group board' do
+      let(:base_group) { create(:group, path: 'base') }
+
+      it 'returns correct path for base group' do
+        @board = create(:board, group: base_group)
+
+        expect(build_issue_link_base).to eq('/base/:project_path/issues')
+      end
+
+      it 'returns correct path for subgroup' do
+        subgroup = create(:group, parent: base_group, path: 'sub')
+        @board = create(:board, group: subgroup)
+
+        expect(build_issue_link_base).to eq('/base/sub/:project_path/issues')
+      end
+    end
+  end
+end