diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-01 16:05:51 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-01 16:05:51 +0200 |
| commit | 5c3cb47c16cacd8e9056f2a68978d69bc153a0f8 (patch) | |
| tree | 39204ec0a55c20310d1a92c5958ef7522ac86135 /db | |
| parent | a73e58f70b264b36b3291bba9a8a2789235ccadb (diff) | |
| parent | 2f1f05d431d1df062e46365930b98b358554a07d (diff) | |
| download | gitlab-ce-5c3cb47c16cacd8e9056f2a68978d69bc153a0f8.tar.gz | |
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
Conflicts:
db/schema.rb
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20130206084024_add_description_to_namsespace.rb | 5 | ||||
| -rw-r--r-- | db/migrate/20130207104426_add_description_to_teams.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 19 |
3 files changed, 23 insertions, 6 deletions
diff --git a/db/migrate/20130206084024_add_description_to_namsespace.rb b/db/migrate/20130206084024_add_description_to_namsespace.rb new file mode 100644 index 00000000000..ef02e489d03 --- /dev/null +++ b/db/migrate/20130206084024_add_description_to_namsespace.rb @@ -0,0 +1,5 @@ +class AddDescriptionToNamsespace < ActiveRecord::Migration + def change + add_column :namespaces, :description, :string, default: '', null: false + end +end diff --git a/db/migrate/20130207104426_add_description_to_teams.rb b/db/migrate/20130207104426_add_description_to_teams.rb new file mode 100644 index 00000000000..6d03777901c --- /dev/null +++ b/db/migrate/20130207104426_add_description_to_teams.rb @@ -0,0 +1,5 @@ +class AddDescriptionToTeams < ActiveRecord::Migration + def change + add_column :user_teams, :description, :string, default: '', null: false + end +end diff --git a/db/schema.rb b/db/schema.rb index e9d428e5ef5..3eb3a7dceec 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -112,6 +112,7 @@ ActiveRecord::Schema.define(:version => 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 => 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 => 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| |