summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorSteven Verbeek <dubcanada@gmail.com>2012-03-24 00:36:54 -0300
committerSteven Verbeek <dubcanada@gmail.com>2012-03-24 00:36:54 -0300
commit6c40e89853a8211c3108245cd92063da0eb0a46b (patch)
tree47a244341dced1b534fcfd4ccc9ae17aa5789f4b /db
parentfafc34b0db23844577e0a99273877c956d087d96 (diff)
parent1c6df8e075abf87c6911be7ca9a691d48b7d4009 (diff)
downloadgitlab-ce-6c40e89853a8211c3108245cd92063da0eb0a46b.tar.gz
merging upstream changes
Diffstat (limited to 'db')
-rw-r--r--db/fixtures/development/004_teams.rb4
-rw-r--r--db/fixtures/development/005_issues.rb20
-rw-r--r--db/migrate/20120323221339_add_bio_field_to_user.rb5
-rw-r--r--db/schema.rb3
4 files changed, 28 insertions, 4 deletions
diff --git a/db/fixtures/development/004_teams.rb b/db/fixtures/development/004_teams.rb
index 3ef55b9206c..5af98b92c02 100644
--- a/db/fixtures/development/004_teams.rb
+++ b/db/fixtures/development/004_teams.rb
@@ -1,7 +1,7 @@
UsersProject.seed(:id, [
{ :id => 1, :project_id => 1, :user_id => 1, :project_access => UsersProject::MASTER },
- { :id => 2, :project_id => 1, :user_id => 2, :project_access => UsersProject::REPORTERW},
- { :id => 3, :project_id => 1, :user_id => 3, :project_access => UsersProject::REPORTERW},
+ { :id => 2, :project_id => 1, :user_id => 2, :project_access => UsersProject::REPORTER},
+ { :id => 3, :project_id => 1, :user_id => 3, :project_access => UsersProject::REPORTER},
{ :id => 4, :project_id => 1, :user_id => 4, :project_access => UsersProject::REPORTER},
{ :id => 5, :project_id => 1, :user_id => 5, :project_access => UsersProject::REPORTER},
diff --git a/db/fixtures/development/005_issues.rb b/db/fixtures/development/005_issues.rb
index cab6f574d8e..32375387bfb 100644
--- a/db/fixtures/development/005_issues.rb
+++ b/db/fixtures/development/005_issues.rb
@@ -15,7 +15,25 @@ Issue.seed(:id, [
{ :id => 13, :project_id => 3, :author_id => 2, :assignee_id => 2, :title => Faker::Lorem.sentence(6)},
{ :id => 14, :project_id => 3, :author_id => 3, :assignee_id => 3, :title => Faker::Lorem.sentence(6)},
{ :id => 15, :project_id => 3, :author_id => 4, :assignee_id => 4, :title => Faker::Lorem.sentence(6)},
- { :id => 16, :project_id => 3, :author_id => 5, :assignee_id => 5, :title => Faker::Lorem.sentence(6)}
+ { :id => 16, :project_id => 3, :author_id => 5, :assignee_id => 5, :title => Faker::Lorem.sentence(6)},
+
+ { :id => 21, :project_id => 1, :author_id => 1, :assignee_id => 1, :title => Faker::Lorem.sentence(6) },
+ { :id => 22, :project_id => 1, :author_id => 2, :assignee_id => 2, :title => Faker::Lorem.sentence(6) },
+ { :id => 23, :project_id => 1, :author_id => 3, :assignee_id => 3, :title => Faker::Lorem.sentence(6) },
+ { :id => 24, :project_id => 1, :author_id => 4, :assignee_id => 4, :title => Faker::Lorem.sentence(6) },
+ { :id => 25, :project_id => 1, :author_id => 5, :assignee_id => 5, :title => Faker::Lorem.sentence(6) },
+
+ { :id => 26, :project_id => 2, :author_id => 1, :assignee_id => 1, :title => Faker::Lorem.sentence(6) },
+ { :id => 27, :project_id => 2, :author_id => 2, :assignee_id => 2, :title => Faker::Lorem.sentence(6) },
+ { :id => 28, :project_id => 2, :author_id => 3, :assignee_id => 3, :title => Faker::Lorem.sentence(6) },
+ { :id => 29, :project_id => 2, :author_id => 4, :assignee_id => 4, :title => Faker::Lorem.sentence(6) },
+ { :id => 30, :project_id => 2, :author_id => 5, :assignee_id => 5, :title => Faker::Lorem.sentence(6) },
+
+ { :id => 32, :project_id => 3, :author_id => 1, :assignee_id => 1, :title => Faker::Lorem.sentence(6)},
+ { :id => 33, :project_id => 3, :author_id => 2, :assignee_id => 2, :title => Faker::Lorem.sentence(6)},
+ { :id => 34, :project_id => 3, :author_id => 3, :assignee_id => 3, :title => Faker::Lorem.sentence(6)},
+ { :id => 35, :project_id => 3, :author_id => 4, :assignee_id => 4, :title => Faker::Lorem.sentence(6)},
+ { :id => 36, :project_id => 3, :author_id => 5, :assignee_id => 5, :title => Faker::Lorem.sentence(6)}
])
diff --git a/db/migrate/20120323221339_add_bio_field_to_user.rb b/db/migrate/20120323221339_add_bio_field_to_user.rb
new file mode 100644
index 00000000000..80a4dec5971
--- /dev/null
+++ b/db/migrate/20120323221339_add_bio_field_to_user.rb
@@ -0,0 +1,5 @@
+class AddBioFieldToUser < ActiveRecord::Migration
+ def change
+ add_column :users, :bio, :string, :null => true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a90b6df1700..d2c54b50f67 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120315132931) do
+ActiveRecord::Schema.define(:version => 20120323221339) do
create_table "events", :force => true do |t|
t.string "target_type"
@@ -156,6 +156,7 @@ ActiveRecord::Schema.define(:version => 20120315132931) do
t.string "authentication_token"
t.boolean "dark_scheme", :default => false, :null => false
t.integer "theme_id", :default => 1, :null => false
+ t.string "bio"
end
add_index "users", ["email"], :name => "index_users_on_email", :unique => true