summaryrefslogtreecommitdiff
path: root/app/controllers/projects/labels_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-04 11:08:21 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-04 11:08:21 +0300
commit4e249dadb5bbcda8e36e6282a36ea2aa1b7900fd (patch)
tree8c5b8289a9844eb8d22ea7e48b84d233953eed06 /app/controllers/projects/labels_controller.rb
parent5921c7481302913bffe88788c354f415cd19df82 (diff)
downloadgitlab-ce-4e249dadb5bbcda8e36e6282a36ea2aa1b7900fd.tar.gz
Fix 500 error when generate labels on labels page. Fixes #1311
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
-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