diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-04 13:01:50 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-04 13:01:50 +0400 |
commit | 23da4cb4f9dd00b33e4973cf297cbbc247cf0e68 (patch) | |
tree | 15d3a2a33216f11acc71be31272aa1345356dfbb /app | |
parent | 781efd183a476986b45f5a9bc407c037f9f14f5f (diff) | |
parent | 4e249dadb5bbcda8e36e6282a36ea2aa1b7900fd (diff) |
Merge branch 'fix-500-on-labels-page' into 'master'
Fix 500 on labels page
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/labels_controller.rb | 2 |
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 |