From 8eeebf0de601f3a05e3fe4d273ead7aaf3257a2c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 25 Feb 2014 17:47:29 +0200 Subject: [PATCH] Generate labels set from issues page --- app/controllers/projects/labels_controller.rb | 2 +- app/views/shared/_project_filter.html.haml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 65f9e2b..0166ca9 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -13,7 +13,7 @@ class Projects::LabelsController < Projects::ApplicationController def generate Gitlab::IssuesLabels.generate(@project) - redirect_to project_labels_path(@project) + redirect_to project_issues_path(@project) end protected diff --git a/app/views/shared/_project_filter.html.haml b/app/views/shared/_project_filter.html.haml index 1315c76..d82b08e 100644 --- a/app/views/shared/_project_filter.html.haml +++ b/app/views/shared/_project_filter.html.haml @@ -40,6 +40,12 @@ .pull-right %i.icon-remove + - if issue_label_names.empty? + .light-well + Add first label to your issues + %br + or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels + %fieldset - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any? = link_to project_entities_path, class: 'cgray pull-right' do -- libgit2 0.21.2