Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
index 73e7476b55d..b8c2255ab7e 100644
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -18,7 +18,7 @@ module BoardsHelper
       time_tracking_limit_to_hours: Gitlab::CurrentSettings.time_tracking_limit_to_hours.to_s,
       recent_boards_endpoint: recent_boards_path,
       parent: current_board_parent.model_name.param_key,
-      group_id: @group&.id,
+      group_id: group_id,
       labels_filter_base_path: build_issue_link_base,
       labels_fetch_path: labels_fetch_path,
       labels_manage_path: labels_manage_path,
@@ -26,6 +26,12 @@ module BoardsHelper
     }
   end
 
+  def group_id
+    return @group.id if board.group_board?
+
+    @project&.group&.id
+  end
+
   def full_path
     if board.group_board?
       @group.full_path