diff options
| author | Adam Leonard <adamjamesleonard@gmail.com> | 2011-10-25 18:34:59 -0400 |
|---|---|---|
| committer | Adam Leonard <adamjamesleonard@gmail.com> | 2011-10-25 18:34:59 -0400 |
| commit | 0955863489ee449389ec08afb498803bc6fbb59e (patch) | |
| tree | 9455900e52e05f6a84725be2b43d9456233e8488 /db | |
| parent | 7087e11f1daeaad16406c19894675ea3466f5ed9 (diff) | |
| parent | f6a67fbad5119e3d95e33cfd4f4e4992707d5ba0 (diff) | |
| download | gitlab-ce-0955863489ee449389ec08afb498803bc6fbb59e.tar.gz | |
Merge branch 'master' of dev.gitlabhq.com:gitlabhq into feature/issues_search
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/development/001_admin.rb | 10 | ||||
| -rw-r--r-- | db/fixtures/production/001_admin.rb | 9 | ||||
| -rw-r--r-- | db/migrate/20111025134235_add_high_label_to_issue.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 3 |
4 files changed, 25 insertions, 2 deletions
diff --git a/db/fixtures/development/001_admin.rb b/db/fixtures/development/001_admin.rb index 9c5a6da09e0..cfff6bf8bc2 100644 --- a/db/fixtures/development/001_admin.rb +++ b/db/fixtures/development/001_admin.rb @@ -1,4 +1,3 @@ -# Admin account admin = User.create( :email => "admin@local.host", :name => "Administrator", @@ -9,3 +8,12 @@ admin = User.create( admin.projects_limit = 10000 admin.admin = true admin.save! + +if admin.valid? +puts %q[ +Administrator account created: + +login.........admin@local.host +password......5iveL!fe +] +end diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb index 94d1abe87ce..cfff6bf8bc2 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/001_admin.rb @@ -8,3 +8,12 @@ admin = User.create( admin.projects_limit = 10000 admin.admin = true admin.save! + +if admin.valid? +puts %q[ +Administrator account created: + +login.........admin@local.host +password......5iveL!fe +] +end diff --git a/db/migrate/20111025134235_add_high_label_to_issue.rb b/db/migrate/20111025134235_add_high_label_to_issue.rb new file mode 100644 index 00000000000..676eaaf8c1b --- /dev/null +++ b/db/migrate/20111025134235_add_high_label_to_issue.rb @@ -0,0 +1,5 @@ +class AddHighLabelToIssue < ActiveRecord::Migration + def change + add_column :issues, :critical, :boolean, :default => false, :null => false + end +end diff --git a/db/schema.rb b/db/schema.rb index cc805990a8b..21c224d4a90 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 => 20111021101550) do +ActiveRecord::Schema.define(:version => 20111025134235) do create_table "issues", :force => true do |t| t.string "title" @@ -23,6 +23,7 @@ ActiveRecord::Schema.define(:version => 20111021101550) do t.datetime "updated_at" t.boolean "closed", :default => false, :null => false t.integer "position", :default => 0 + t.boolean "critical", :default => false, :null => false end create_table "keys", :force => true do |t| |