Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-29 19:23:18 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-29 19:23:18 +0400
commit6fb9badcaef5152c60bf4091899a84b34f5cc1b8 (patch)
treed550b8cd824aba48bc89f91c7fe888123123b7b4 /app/controllers/dashboard_controller.rb
parent03654a6abf47c88b8b980a6707874ff78080d2fe (diff)
Replace project labels with tags to prevent name conflict with GitLab labels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/dashboard_controller.rb')
-rw-r--r--app/controllers/dashboard_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 233b91680f6..5aff526d1b5 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -46,11 +46,11 @@ class DashboardController < ApplicationController
@projects = @projects.where(namespace_id: Group.find_by(name: params[:group])) if params[:group].present?
@projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present?
@projects = @projects.includes(:namespace)
- @projects = @projects.tagged_with(params[:label]) if params[:label].present?
+ @projects = @projects.tagged_with(params[:tag]) if params[:tag].present?
@projects = @projects.sort(@sort = params[:sort])
@projects = @projects.page(params[:page]).per(30)
- @labels = current_user.authorized_projects.tags_on(:labels)
+ @tags = current_user.authorized_projects.tags_on(:tags)
@groups = current_user.authorized_groups
end