diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-26 16:15:10 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-27 13:26:00 +0200 |
commit | 78bae3fdb5f49961d6ca2b9fc6074dabe9d6ac7a (patch) | |
tree | 0da3de04805604fc1ac7458a20dfd20aecb459f9 | |
parent | 16f0b9c5b153dca90600893f4251aea79b8da198 (diff) | |
download | gitlab-ce-78bae3fdb5f49961d6ca2b9fc6074dabe9d6ac7a.tar.gz |
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>
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/controllers/projects/tags_controller.rb | 3 | ||||
-rw-r--r-- | spec/controllers/projects/tags_controller_spec.rb | 20 |
3 files changed, 23 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 6290e6f9544..b25c92a74d3 100644 --- a/CHANGELOG +++ b/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 diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb index 6dc495247c8..8592579abbd 100644 --- a/app/controllers/projects/tags_controller.rb +++ b/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 diff --git a/spec/controllers/projects/tags_controller_spec.rb b/spec/controllers/projects/tags_controller_spec.rb new file mode 100644 index 00000000000..a6995145cc1 --- /dev/null +++ b/spec/controllers/projects/tags_controller_spec.rb @@ -0,0 +1,20 @@ +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 |