summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus G Thiel <linus@yesbabyyes.se>2016-10-05 19:31:33 +0200
committerLinus G Thiel <linus@yesbabyyes.se>2016-10-05 19:38:16 +0200
commitff378e19e6dc385f1c85b7704263129a56778752 (patch)
tree56beedeeed01cd171cc3e6f409ff02e080112947
parent6b9671388d523a03b058e1cc467de77d805fc7a2 (diff)
downloadgitlab-ce-ff378e19e6dc385f1c85b7704263129a56778752.tar.gz
Respond with 404 Not Found for non-existent tags
Non-existent tags should be handled with 404 Not Found.
-rw-r--r--CHANGELOG3
-rw-r--r--app/controllers/projects/tags_controller.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1b461f54729..fd480bf87be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
+ - Respond with 404 Not Found for non-existent tags (Linus Thiel)
- Update runner version only when updating contacted_at
- Add link from system note to compare with previous version
- Use gitlab-shell v3.6.2 (GIT TRACE logging)
@@ -90,8 +91,6 @@ v 8.12.1
- Fix issue with search filter labels not displaying
v 8.12.0
-v 8.12.0 (unreleased)
- - Respond with 404 Not Found for non-existent tags
- Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251
- Only check :can_resolve permission if the note is resolvable
- Bump fog-aws to v0.11.0 to support ap-south-1 region
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 40899abf6ee..8fea20cefef 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -20,7 +20,7 @@ class Projects::TagsController < Projects::ApplicationController
def show
@tag = @repository.find_tag(params[:id])
- return render_404 if @tag.nil?
+ return render_404 unless @tag
@release = @project.releases.find_or_initialize_by(tag: @tag.name)
@commit = @repository.commit(@tag.target)