Merge branch 'fix-500-on-labels-page' into 'master'

Fix 500 on labels page

Merge branch 'fix-500-on-labels-page' into 'master'
23da4cb4 · Dmitriy Zaporozhets · 781efd18 · 4e249dad · 23da4cb4
Commit 23da4cb4 authored Jun 04, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

labels_controller.rb app/controllers/projects/labels_controller.rb +2 -0

No files found.
--- 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