diff options
| author | Raffael Schmid <raf@nine.ch> | 2014-01-23 10:55:26 +0100 |
|---|---|---|
| committer | Raffael Schmid <raf@nine.ch> | 2014-01-23 10:55:26 +0100 |
| commit | 7863319b97498a7621815cfe5691794ecb86b8c5 (patch) | |
| tree | 5ae991fe7543bcb91e9257242e87849538b33214 /db/schema.rb | |
| parent | 568d1c27c5a1b4d6749943240cdba2625eee2b6e (diff) | |
| parent | 68590fddd860c5d840d8f04314ed11f0d02ddd44 (diff) | |
| download | gitlab-ce-7863319b97498a7621815cfe5691794ecb86b8c5.tar.gz | |
Merge branch 'master' into dont-depend-on-appid-and-appsecret
* master: (238 commits)
Version 6.5.1
Fix selectbox when submit MR from fork to origin
Fix HELP layout
No need for code tag here.
Spelling mistake and add links.
Warn against RVM.
Remove GitHub mention because we also have a GitLab issue tracker now.
Replace 6.0-to-6.4.md with 6.0-to-6.5.md
Add public assets to gitignore
Version 6.5.0
Use 6-5 branch in installation docs
Remove deprecated twitter handle.
Further explain userPrincipalName settings
Update from 6.4 to 6.5 guide
Explain how to use AD userPrincipalName for logins
More entries to CHANGELOG. Version to rc1
Rephrase LDAP check script output
add O'Reilly sponsorship in CHANGELOG
Fix select2 css for drop above style
Rename "Website url" labels to "Website"
...
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index e02799e0dbc..73d0a92e1cc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20131217102743) do +ActiveRecord::Schema.define(version: 20140116231608) do create_table "broadcast_messages", force: true do |t| t.text "message", null: false @@ -301,6 +301,7 @@ ActiveRecord::Schema.define(version: 20131217102743) do t.datetime "confirmation_sent_at" t.string "unconfirmed_email" t.boolean "hide_no_ssh_key", default: false + t.string "website_url", default: "", null: false end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |