Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq …

…into Undev-team-and-group-descriptions Conflicts: db/schema.rb

Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq …
…into Undev-team-and-group-descriptions Conflicts: db/schema.rb
Dmitriy Zaporozhets
2 parents a73e58f7 2f1f05d4
Showing 26 changed files with 155 additions and 45 deletions Show diff stats
app/models/group.rb
app/models/namespace.rb
app/models/user_team.rb
app/views/admin/groups/edit.html.haml
app/views/admin/groups/index.html.haml
app/views/admin/groups/new.html.haml
app/views/admin/groups/show.html.haml
app/views/admin/teams/edit.html.haml
app/views/admin/teams/index.html.haml
app/views/admin/teams/new.html.haml
app/views/admin/teams/show.html.haml
app/views/groups/edit.html.haml
app/views/groups/new.html.haml
app/views/groups/show.html.haml
app/views/teams/edit.html.haml
app/views/teams/new.html.haml
app/views/teams/show.html.haml
db/migrate/20130206084024_add_description_to_namsespace.rb
db/migrate/20130207104426_add_description_to_teams.rb
db/schema.rb
@@ -2,13 +2,14 @@
 #
 # Table name: namespaces
 #
-#  id         :integer          not null, primary key
-#  name       :string(255)      not null
-#  path       :string(255)      not null
-#  owner_id   :integer          not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  type       :string(255)
+#  id          :integer          not null, primary key
+#  name        :string(255)      not null
+#  description :string(255)      not null
+#  path        :string(255)      not null
+#  owner_id    :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  type        :string(255)
 #
 class Group < Namespace
@@ -2,17 +2,18 @@
 #
 # Table name: namespaces
 #
-#  id         :integer          not null, primary key
-#  name       :string(255)      not null
-#  path       :string(255)      not null
-#  owner_id   :integer          not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  type       :string(255)
+#  id          :integer          not null, primary key
+#  name        :string(255)      not null
+#  description :string(255)      not null
+#  path        :string(255)      not null
+#  owner_id    :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  type        :string(255)
 #
 class Namespace < ActiveRecord::Base
-  attr_accessible :name, :path
+  attr_accessible :name, :description, :path
   has_many :projects, dependent: :destroy
   belongs_to :owner, class_name: "User"
@@ -22,7 +23,7 @@ class Namespace &lt; ActiveRecord::Base
             length: { within: 0..255 },
             format: { with: Gitlab::Regex.name_regex,
                       message: "only letters, digits, spaces & '_' '-' '.' allowed." }
-
+  validates :description, length: { within: 0..255 }
   validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
             format: { with: Gitlab::Regex.path_regex,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
@@ -11,7 +11,7 @@
 #
 class UserTeam < ActiveRecord::Base
-  attr_accessible :name, :owner_id, :path
+  attr_accessible :name, :description, :owner_id, :path
   belongs_to :owner, class_name: User
@@ -26,6 +26,7 @@ class UserTeam &lt; ActiveRecord::Base
             length: { within: 0..255 },
             format: { with: Gitlab::Regex.name_regex,
                       message: "only letters, digits, spaces & '_' '-' '.' allowed." }
+  validates :description, length: { within: 0..255 }
   validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
             format: { with: Gitlab::Regex.path_regex,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
-%h3.page_title Rename Group
+%h3.page_title Edit Group
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?
@@ -10,7 +10,10 @@
     .input
       = f.text_field :name, placeholder: "Example Group", class: "xxlarge"
-
+  .clearfix.group-description-holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
   .clearfix.group_name_holder
     = f.label :path do
@@ -24,5 +27,5 @@
         %li It will change the git path to repositories under this group.
   .form-actions
-    = f.submit 'Rename group', class: "btn btn-remove"
+    = f.submit 'Edit group', class: "btn btn-remove"
     = link_to  'Cancel', admin_groups_path, class: "btn btn-cancel"
@@ -17,6 +17,7 @@
         Name
         %i.icon-sort-down
       %th Path
+      %th Description
       %th Projects
       %th Owner
       %th.cred Danger Zone!
@@ -25,11 +26,12 @@
     %tr
       %td
         %strong= link_to group.name, [:admin, group]
+      %td= group.description
       %td= group.path
       %td= group.projects.count
       %td
         = link_to group.owner_name, admin_user_path(group.owner)
       %td.bgred
-        = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small"
+        = link_to 'Edit', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn btn-small"
         = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
 = paginate @groups, theme: "admin"
@@ -9,8 +9,14 @@
       Group name is
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
-      &nbsp;
-      = f.submit 'Create group', class: "btn btn-primary"
+  .clearfix.group-description-holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Create group', class: "btn btn-primary"
+
   %hr
   .padded
     %ul
@@ -16,7 +16,13 @@
       &nbsp;
       = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
         %i.icon-edit
-        Rename
+        Edit
+  %tr
+    %td
+      %b
+        Description:
+    %td
+      = @group.description
   %tr
     %td
       %b
-%h3.page_title Rename Team
+%h3.page_title Edit Team
 %hr
 = form_for @team, url: admin_team_path(@team), method: :put do |f|
   - if @team.errors.any?
@@ -10,6 +10,11 @@
     .input
       = f.text_field :name, placeholder: "Example Team", class: "xxlarge"
+  .clearfix.team-description-holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
   .clearfix.team_name_holder
     = f.label :path do
       %span.cred Team path is
@@ -19,5 +24,5 @@
         %li It will change web url for access team and team projects.
   .form-actions
-    = f.submit 'Rename team', class: "btn btn-remove"
+    = f.submit 'Edit team', class: "btn btn-remove"
     = link_to  'Cancel', admin_teams_path, class: "btn btn-cancel"
@@ -16,6 +16,7 @@
       %th
         Name
         %i.icon-sort-down
+      %th Description
       %th Path
       %th Projects
       %th Members
@@ -26,13 +27,14 @@
     %tr
       %td
         %strong= link_to team.name, admin_team_path(team)
+      %td= team.description
       %td= team.path
       %td= team.projects.count
       %td= team.members.count
       %td
         = link_to team.owner.name, admin_user_path(team.owner)
       %td.bgred
-        = link_to 'Rename', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small"
+        = link_to 'Edit', edit_admin_team_path(team), id: "edit_#{dom_id(team)}", class: "btn btn-small"
         = link_to 'Destroy', admin_team_path(team), confirm: "REMOVE #{team.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
 = paginate @teams, theme: "admin"
@@ -9,8 +9,15 @@
       Team name is
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
-      &nbsp;
-      = f.submit 'Create team', class: "btn btn-primary"
+
+  .clearfix.team-description-holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Create team', class: "btn btn-primary"
+
   %hr
   .padded
     %ul
@@ -16,7 +16,13 @@
       &nbsp;
       = link_to edit_admin_team_path(@team), class: "btn btn-small pull-right" do
         %i.icon-edit
-        Rename
+        Edit
+  %tr
+    %td
+      %b
+        Description:
+    %td
+      = @team.description
   %tr
     %td
       %b
@@ -9,8 +9,15 @@
       Group name is
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
-      &nbsp;
-      = f.submit 'Save group', class: "btn btn-save"
+
+  .clearfix.group-description-holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Save group', class: "btn btn-save"
+
 %hr
@@ -9,8 +9,16 @@
       Group name is
     .input
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
-      &nbsp;
-      = f.submit 'Create group', class: "btn btn-create"
+
+  .clearfix.group-description-holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Create group', class: "btn btn-primary"
+
+
   %hr
   .padded
     %ul
+- if @group.description.present?
+  .description
+    = @group.description
+  %hr
+
 .projects
   .activities.span8
     = render "events/event_last_push", event: @last_push
@@ -12,13 +12,20 @@
         .input
           = f.text_field :name, placeholder: "Ex. OpenSource", class: "xlarge left"
+      .clearfix.team-description-holder
+        = f.label :description, "Details"
+        .input
+          = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
       .clearfix
         = f.label :path do
           Team path is
         .input
           = f.text_field :path, placeholder: "opensource", class: "xlarge left"
+
       .form-actions
-        = f.submit 'Save team changes', class: "btn btn-save"
+        = f.submit 'Save team changes', class: "btn btn-primary"
+        = link_to 'Delete team', team_path(@team), method: :delete, confirm: "You are shure?", class: "btn btn-remove pull-right"
   .span5
     .ui-box
       %h5.title Remove team
@@ -26,4 +33,3 @@
         %p
           Removed team can not be restored!
         = link_to 'Remove team', team_path(@team), method: :delete, confirm: "You are sure?", class: "btn btn-remove btn-small"
-
@@ -9,8 +9,15 @@
       Team name is
     .input
       = f.text_field :name, placeholder: "Ex. Ruby Developers", class: "xxlarge left"
-      &nbsp;
-      = f.submit 'Create team', class: "btn btn-create"
+
+  .clearfix.team-description-holder
+    = f.label :description, "Details"
+    .input
+      = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
+
+  .form-actions
+    = f.submit 'Create team', class: "btn btn-create"
+
   %hr
   .padded
     %ul
+- if @team.description.present?
+  .description
+    = @team.description
+  %hr
+
 .projects
   .activities.span8
     = link_to dashboard_path, class: 'btn btn-tiny' do
@@ -0,0 +1,5 @@
+class AddDescriptionToNamsespace < ActiveRecord::Migration
+  def change
+    add_column :namespaces, :description, :string, default: '', null: false
+  end
+end
@@ -0,0 +1,5 @@
+class AddDescriptionToTeams < ActiveRecord::Migration
+  def change
+    add_column :user_teams, :description, :string, default: '', null: false
+  end
+end
@@ -112,6 +112,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130220133245) do
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
     t.string   "type"
+    t.string   "description", :default => "", :null => false
   end
   add_index "namespaces", ["name"], :name => "index_namespaces_on_name"
@@ -142,14 +143,14 @@ ActiveRecord::Schema.define(:version =&gt; 20130220133245) do
     t.string   "name"
     t.string   "path"
     t.text     "description"
-    t.datetime "created_at",                                   :null => false
-    t.datetime "updated_at",                                   :null => false
+    t.datetime "created_at",                                :null => false
+    t.datetime "updated_at",                                :null => false
     t.integer  "creator_id"
     t.string   "default_branch"
-    t.boolean  "issues_enabled",         :default => true,     :null => false
-    t.boolean  "wall_enabled",           :default => true,     :null => false
-    t.boolean  "merge_requests_enabled", :default => true,     :null => false
-    t.boolean  "wiki_enabled",           :default => true,     :null => false
+    t.boolean  "issues_enabled",         :default => true,  :null => false
+    t.boolean  "wall_enabled",           :default => true,  :null => false
+    t.boolean  "merge_requests_enabled", :default => true,  :null => false
+    t.boolean  "wiki_enabled",           :default => true,  :null => false
     t.integer  "namespace_id"
     t.boolean  "public",                 :default => false,    :null => false
     t.string   "issues_tracker",         :default => "gitlab", :null => false
@@ -232,8 +233,14 @@ ActiveRecord::Schema.define(:version =&gt; 20130220133245) do
     t.string   "name"
     t.string   "path"
     t.integer  "owner_id"
+<<<<<<< HEAD
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+=======
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.string   "description", :default => "", :null => false
+>>>>>>> 2f1f05d431d1df062e46365930b98b358554a07d
   end
   create_table "users", :force => true do |t|
@@ -25,11 +25,13 @@ class AdminGroups &lt; Spinach::FeatureSteps
   And 'submit form with new group info' do
     fill_in 'group_name', :with => 'gitlab'
+    fill_in 'group_description', :with => 'Group description'
     click_button "Create group"
   end
   Then 'I should see newly created group' do
     page.should have_content "Group: gitlab"
+    page.should have_content "Group description"
   end
   Then 'I should be redirected to group page' do
@@ -18,6 +18,7 @@ class AdminTeams &lt; Spinach::FeatureSteps
   And 'submit form with new team info' do
     fill_in 'user_team_name', with: 'gitlab'
+    fill_in 'user_team_description', with: 'description'
     click_button 'Create team'
   end
@@ -27,6 +28,7 @@ class AdminTeams &lt; Spinach::FeatureSteps
   And 'I should see newly created team' do
     page.should have_content "Team: gitlab"
+    page.should have_content "description"
   end
   When 'I visit admin teams page' do
@@ -69,12 +69,14 @@ class Groups &lt; Spinach::FeatureSteps
   end
   And 'submit form with new group info' do
-    fill_in 'group_name', :with => 'Samurai'
+    fill_in 'group_name', with: 'Samurai'
+    fill_in 'group_description', with: 'Tokugawa Shogunate'
     click_button "Create group"
   end
   Then 'I should see newly created group' do
     page.should have_content "Samurai"
+    page.should have_content "Tokugawa Shogunate"
     page.should have_content "You will only see events from projects in this group"
   end
@@ -44,9 +44,16 @@ class Userteams &lt; Spinach::FeatureSteps
     And 'I submit form with new team info' do
       fill_in 'name', with: 'gitlab'
+
+      fill_in 'user_team_description', with: 'team description'
       click_button 'Create team'
     end
+    And 'I should see newly created team' do
+      page.should have_content "gitlab"
+      page.should have_content "team description"
+    end
+
     Then 'I should be redirected to new team page' do
       team = UserTeam.last
       current_path.should == team_path(team)
@@ -20,6 +20,7 @@ Feature: UserTeams
     When I click to "New team" link
     And I submit form with new team info
     Then I should be redirected to new team page
+    Then I should see newly created team
   Scenario: I should see team dashboard list
     When I have teams with projects and members
@@ -15,6 +15,7 @@
 FactoryGirl.define do
   factory :user_team do
     sequence(:name) { |n| "team#{n}" }
+    sequence(:description) { |n| "team_description#{n}" }
     path { name.downcase.gsub(/\s/, '_') }
     owner
   end
	@@ -9,8 +9,15 @@		@@ -9,8 +9,15 @@
9	Team name is	9	Team name is
10	.input	10	.input
11	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"	11	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12	-
13	- = f.submit 'Create team', class: "btn btn-primary"	12	+
		13	+ .clearfix.team-description-holder
		14	+ = f.label :description, "Details"
		15	+ .input
		16	+ = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
		17	+
		18	+ .form-actions
		19	+ = f.submit 'Create team', class: "btn btn-primary"
		20	+
14	%hr	21	%hr
15	.padded	22	.padded
16	%ul	23	%ul
	@@ -9,8 +9,15 @@		@@ -9,8 +9,15 @@
9	Group name is	9	Group name is
10	.input	10	.input
11	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"	11	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12	-
13	- = f.submit 'Save group', class: "btn btn-save"	12	+
		13	+ .clearfix.group-description-holder
		14	+ = f.label :description, "Details"
		15	+ .input
		16	+ = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
		17	+
		18	+ .form-actions
		19	+ = f.submit 'Save group', class: "btn btn-save"
		20	+
14	%hr	21	%hr
15		22
16		23
	@@ -9,8 +9,16 @@		@@ -9,8 +9,16 @@
9	Group name is	9	Group name is
10	.input	10	.input
11	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"	11	= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
12	-
13	- = f.submit 'Create group', class: "btn btn-create"	12	+
		13	+ .clearfix.group-description-holder
		14	+ = f.label :description, "Details"
		15	+ .input
		16	+ = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
		17	+
		18	+ .form-actions
		19	+ = f.submit 'Create group', class: "btn btn-primary"
		20	+
		21	+
14	%hr	22	%hr
15	.padded	23	.padded
16	%ul	24	%ul
		1	+- if @group.description.present?
		2	+ .description
		3	+ = @group.description
		4	+ %hr
		5	+
1	.projects	6	.projects
2	.activities.span8	7	.activities.span8
3	= render "events/event_last_push", event: @last_push	8	= render "events/event_last_push", event: @last_push
		1	+- if @team.description.present?
		2	+ .description
		3	+ = @team.description
		4	+ %hr
		5	+
1	.projects	6	.projects
2	.activities.span8	7	.activities.span8
3	= link_to dashboard_path, class: 'btn btn-tiny' do	8	= link_to dashboard_path, class: 'btn btn-tiny' do
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddDescriptionToNamsespace < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :namespaces, :description, :string, default: '', null: false
	4	+ end
	5	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class AddDescriptionToTeams < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :user_teams, :description, :string, default: '', null: false
	4	+ end
	5	+end
	@@ -20,6 +20,7 @@ Feature: UserTeams		@@ -20,6 +20,7 @@ Feature: UserTeams
20	When I click to "New team" link	20	When I click to "New team" link
21	And I submit form with new team info	21	And I submit form with new team info
22	Then I should be redirected to new team page	22	Then I should be redirected to new team page
		23	+ Then I should see newly created team
23		24
24	Scenario: I should see team dashboard list	25	Scenario: I should see team dashboard list
25	When I have teams with projects and members	26	When I have teams with projects and members