Commit 90922cdb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Replace project labels with tags to prevent name conflict with GitLab labels



Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent ddbe06014178
......@@ -46,7 +46,7 @@
@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)
......@@ -50,7 +50,7 @@
@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
......
......@@ -196,7 +196,7 @@
def project_params
params.require(:project).permit(
:name, :path, :description, :issues_tracker, :label_list,
:name, :path, :description, :issues_tracker, :tag_list,
:issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
:wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id
)
......
......@@ -42,7 +42,7 @@
ActsAsTaggableOn.strict_case_match = true
acts_as_taggable_on :labels, :issues_default_labels
acts_as_taggable_on :tags, :issues_default_labels
attr_accessor :new_default_branch
......
......@@ -44,5 +44,5 @@
- if @labels.present?
- if @tags.present?
%fieldset
......@@ -48,3 +48,3 @@
%fieldset
%legend Labels
%legend Tags
%ul.nav.nav-pills.nav-stacked.nav-small
......@@ -50,5 +50,5 @@
%ul.nav.nav-pills.nav-stacked.nav-small
- @labels.each do |label|
%li{ class: (label.name == params[:label]) ? 'active' : 'light' }
= link_to projects_dashboard_filter_path(scope: params[:scope], label: label.name) do
- @tags.each do |tag|
%li{ class: (tag.name == params[:tag]) ? 'active' : 'light' }
= link_to projects_dashboard_filter_path(scope: params[:scope], tag: tag.name) do
%i.icon-tag
......@@ -54,2 +54,2 @@
%i.icon-tag
= label.name
= tag.name
......@@ -54,6 +54,6 @@
%span.label
%i.icon-archive
Archived
- project.labels.each do |label|
- project.tags.each do |tag|
%span.label.label-info
%i.icon-tag
......@@ -58,6 +58,6 @@
%span.label.label-info
%i.icon-tag
= label.name
= tag.name
- if project.description.present?
%p= truncate project.description, length: 100
.last-activity
......
......@@ -33,5 +33,5 @@
%fieldset.features
%legend
Labels:
Tags:
.form-group
......@@ -37,3 +37,3 @@
.form-group
= f.label :label_list, "Labels", class: 'control-label'
= f.label :tag_list, "Tags", class: 'control-label'
.col-sm-10
......@@ -39,6 +39,6 @@
.col-sm-10
= f.text_field :label_list, maxlength: 2000, class: "form-control"
%p.hint Separate labels with commas.
= f.text_field :tag_list, maxlength: 2000, class: "form-control"
%p.hint Separate tags with commas.
%fieldset.features
%legend
......
class MigrateProjectTags < ActiveRecord::Migration
def up
ActsAsTaggableOn::Tagging.where(taggable_type: 'Project', context: 'labels').update_all(context: 'tags')
end
def down
ActsAsTaggableOn::Tagging.where(taggable_type: 'Project', context: 'tags').update_all(context: 'labels')
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20140729140420) do
ActiveRecord::Schema.define(version: 20140729145339) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment