Merge branch '20233-confidential-issue' into 'master'

Show release notes in tag list

See merge request !5503
Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG

@@ -16,6 +16,7 @@ v 8.10.2 (unreleased)
   - Don't show comment button in gutter of diffs on MR discussion tab. !5493
   - Rescue Rugged::OSError (lock exists) when creating references. !5497
   - Fix expand all diffs button in compare view. !5500
+  - Show release notes in tags list. !5503
 
 v 8.10.1
   - Refactor repository storages documentation. !5428

app/controllers/projects/tags_controller.rb

@@ -10,11 +10,12 @@ class Projects::TagsController < Projects::ApplicationController
     @tags = @repository.tags_sorted_by(@sort)
     @tags = Kaminari.paginate_array(@tags).page(params[:page])
 
-    @releases = project.releases.where(tag: @tags)
+    @releases = project.releases.where(tag: @tags.map(&:name))
   end
 
   def show
     @tag = @repository.find_tag(params[:id])
+
     @release = @project.releases.find_or_initialize_by(tag: @tag.name)
     @commit = @repository.commit(@tag.target)
   end

spec/controllers/projects/tags_controller_spec.rb

+require 'spec_helper'
+
+describe Projects::TagsController do
+  let(:project) { create(:project, :public) }
+  let!(:release) { create(:release, project: project) }
+  let!(:invalid_release) { create(:release, project: project, tag: 'does-not-exist') }
+
+  describe 'GET index' do
+    before { get :index, namespace_id: project.namespace.to_param, project_id: project.to_param }
+
+    it 'returns the tags for the page' do
+      expect(assigns(:tags).map(&:name)).to eq(['v1.1.0', 'v1.0.0'])
+    end
+
+    it 'returns releases matching those tags' do
+      expect(assigns(:releases)).to include(release)
+      expect(assigns(:releases)).not_to include(invalid_release)
+    end
+  end
+end