diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-07 19:26:41 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-07 19:26:41 +0300 |
| commit | 03441769dfc09776eb8511275a3f492ded1a7c42 (patch) | |
| tree | bfc6ed0dae6c8e73a43eae071daf7b7753acb9a0 /app/controllers/labels_controller.rb | |
| parent | be68cc461755752697642c58154781ae4ec9ab31 (diff) | |
| download | gitlab-ce-03441769dfc09776eb8511275a3f492ded1a7c42.tar.gz | |
Include default labels in issues autocomplete etc. Show colored labels on issues show page
Diffstat (limited to 'app/controllers/labels_controller.rb')
| -rw-r--r-- | app/controllers/labels_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/labels_controller.rb b/app/controllers/labels_controller.rb index cb332a45ed2..0e78cecf4d1 100644 --- a/app/controllers/labels_controller.rb +++ b/app/controllers/labels_controller.rb @@ -7,11 +7,11 @@ class LabelsController < ProjectResourceController respond_to :js, :html def index - @labels = @project.issues_labels.order('count DESC') + @labels = @project.issues_labels end def generate - Gitlab::Labels.generate(@project) + Gitlab::IssuesLabels.generate(@project) redirect_to project_labels_path(@project) end |