deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merging upstream changes

Browse source
This commit is contained in:
Steven Verbeek 2012-03-24 00:36:54 -03:00
commit 6c40e89853
47 changed files with 383 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

3
db/schema.rb
View file

@ -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