Skip to content
Snippets Groups Projects
Verified Commit 6fb9badc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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

parent 03654a6a
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
 
Loading
Loading
Loading
Loading
@@ -196,7 +196,7 @@ class ProjectsController < ApplicationController
 
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
)
Loading
Loading
Loading
Loading
@@ -42,7 +42,7 @@ class Project < ActiveRecord::Base
 
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
 
Loading
Loading
Loading
Loading
@@ -44,12 +44,12 @@
 
 
 
- if @labels.present?
- if @tags.present?
%fieldset
%legend Labels
%legend Tags
%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
= label.name
= tag.name
Loading
Loading
@@ -54,10 +54,10 @@
%span.label
%i.icon-archive
Archived
- project.labels.each do |label|
- project.tags.each do |tag|
%span.label.label-info
%i.icon-tag
= label.name
= tag.name
- if project.description.present?
%p= truncate project.description, length: 100
.last-activity
Loading
Loading
Loading
Loading
@@ -33,12 +33,12 @@
 
%fieldset.features
%legend
Labels:
Tags:
.form-group
= f.label :label_list, "Labels", class: 'control-label'
= f.label :tag_list, "Tags", class: 'control-label'
.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
Loading
Loading
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
Loading
Loading
@@ -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"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment