Commit edf41005 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Add project labels support

parent b6203ff81760
...@@ -28,12 +28,14 @@ class Project < ActiveRecord::Base ...@@ -28,12 +28,14 @@ class Project < ActiveRecord::Base
include Gitlab::ShellAdapter include Gitlab::ShellAdapter
extend Enumerize extend Enumerize
attr_accessible :name, :path, :description, :default_branch, :issues_tracker, attr_accessible :name, :path, :description, :default_branch, :issues_tracker, :label_list,
:issues_enabled, :wall_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :issues_enabled, :wall_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id,
:wiki_enabled, :public, :import_url, :last_activity_at, as: [:default, :admin] :wiki_enabled, :public, :import_url, :last_activity_at, as: [:default, :admin]
attr_accessible :namespace_id, :creator_id, as: :admin attr_accessible :namespace_id, :creator_id, as: :admin
acts_as_taggable_on :labels
attr_accessor :import_url attr_accessor :import_url
# Relations # Relations
......
...@@ -49,6 +49,10 @@ ...@@ -49,6 +49,10 @@
.left .left
- if project.description.present? - if project.description.present?
%span.light= project.description %span.light= project.description
- project.labels.each do |label|
%span.label.label-info
%i.icon-tag
= label.name
.pull-right.light .pull-right.light
%small.light %small.light
......
...@@ -57,6 +57,15 @@ ...@@ -57,6 +57,15 @@
authentication. authentication.
It will also be listed on the #{link_to "public access directory", public_root_path}. It will also be listed on the #{link_to "public access directory", public_root_path}.
%fieldset.features
%legend
Labels:
.control-group
= f.label :label_list, "Labels", class: 'control-label'
.controls
= f.text_field :label_list, maxlength: 2000, class: "xxlarge"
%p.hint Separate with comma.
%fieldset.features %fieldset.features
%legend %legend
Features: Features:
......
Markdown is supported
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