summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-04 09:01:50 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-04 09:01:50 +0000
commit23da4cb4f9dd00b33e4973cf297cbbc247cf0e68 (patch)
tree15d3a2a33216f11acc71be31272aa1345356dfbb
parent781efd183a476986b45f5a9bc407c037f9f14f5f (diff)
parent4e249dadb5bbcda8e36e6282a36ea2aa1b7900fd (diff)
downloadgitlab-ce-23da4cb4f9dd00b33e4973cf297cbbc247cf0e68.tar.gz
Merge branch 'fix-500-on-labels-page' into 'master'
Fix 500 on labels page
-rw-r--r--app/controllers/projects/labels_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index b037cf56502..30fcb64cbb2 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -16,6 +16,8 @@ class Projects::LabelsController < Projects::ApplicationController
redirect_to project_issues_path(@project)
elsif params[:redirect] == 'merge_requests'
redirect_to project_merge_requests_path(@project)
+ else
+ redirect_to project_labels_path(@project)
end
end