diff options
| -rw-r--r-- | app/views/shared/ref/_patching.html.erb | 3 | ||||
| -rw-r--r-- | db/schema.rb | 17 |
2 files changed, 12 insertions, 8 deletions
diff --git a/app/views/shared/ref/_patching.html.erb b/app/views/shared/ref/_patching.html.erb index a0d1dd48..a2507774 100644 --- a/app/views/shared/ref/_patching.html.erb +++ b/app/views/shared/ref/_patching.html.erb @@ -1,7 +1,8 @@ <h3 class='patching'>Patching</h3> <ul class='unstyled'> - <li><%= man('git-diff') %></li> <li><%= man('git-apply') %></li> <li><%= man('git-cherry-pick') %></li> + <li><%= man('git-diff') %></li> <li><%= man('git-rebase') %></li> + <li><%= man('git-revert') %></li> </ul> diff --git a/db/schema.rb b/db/schema.rb index 10359179..4d62523d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -13,13 +13,16 @@ ActiveRecord::Schema.define(version: 20121211011752) do + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + create_table "books", force: true do |t| t.string "code" t.datetime "created_at" t.datetime "updated_at" end - add_index "books", ["code"], name: "index_books_on_code" + add_index "books", ["code"], name: "index_books_on_code", using: :btree create_table "chapters", force: true do |t| t.string "title" @@ -30,7 +33,7 @@ ActiveRecord::Schema.define(version: 20121211011752) do t.string "sha" end - add_index "chapters", ["book_id"], name: "index_chapters_on_book_id" + add_index "chapters", ["book_id"], name: "index_chapters_on_book_id", using: :btree create_table "doc_files", force: true do |t| t.string "name" @@ -38,7 +41,7 @@ ActiveRecord::Schema.define(version: 20121211011752) do t.datetime "updated_at" end - add_index "doc_files", ["name"], name: "index_doc_files_on_name" + add_index "doc_files", ["name"], name: "index_doc_files_on_name", using: :btree create_table "doc_versions", force: true do |t| t.integer "version_id" @@ -56,7 +59,7 @@ ActiveRecord::Schema.define(version: 20121211011752) do t.datetime "updated_at" end - add_index "docs", ["blob_sha"], name: "index_docs_on_blob_sha" + add_index "docs", ["blob_sha"], name: "index_docs_on_blob_sha", using: :btree create_table "downloads", force: true do |t| t.string "url" @@ -91,8 +94,8 @@ ActiveRecord::Schema.define(version: 20121211011752) do t.integer "number" end - add_index "sections", ["chapter_id"], name: "index_sections_on_chapter_id" - add_index "sections", ["slug"], name: "index_sections_on_slug" + add_index "sections", ["chapter_id"], name: "index_sections_on_chapter_id", using: :btree + add_index "sections", ["slug"], name: "index_sections_on_slug", using: :btree create_table "versions", force: true do |t| t.string "name" @@ -104,6 +107,6 @@ ActiveRecord::Schema.define(version: 20121211011752) do t.float "vorder" end - add_index "versions", ["name"], name: "index_versions_on_name" + add_index "versions", ["name"], name: "index_versions_on_name", using: :btree end |