Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993

4 files changed, 45 insertions, 11 deletions

diff --git a/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
new file mode 100644
index 00000000000..de2078a9268
--- /dev/null
+++ b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
@@ -0,0 +1,8 @@
+class RemoveOauthTokensFromUsers < ActiveRecord::Migration
+  def change
+    remove_column :users, :github_access_token, :string
+    remove_column :users, :gitlab_access_token, :string
+    remove_column :users, :bitbucket_access_token, :string
+    remove_column :users, :bitbucket_access_token_secret, :string
+  end
+end
diff --git a/db/migrate/20150818213832_add_sent_notifications.rb b/db/migrate/20150818213832_add_sent_notifications.rb
new file mode 100644
index 00000000000..43e8d6a1a82
--- /dev/null
+++ b/db/migrate/20150818213832_add_sent_notifications.rb
@@ -0,0 +1,13 @@
+class AddSentNotifications < ActiveRecord::Migration
+  def change
+    create_table :sent_notifications do |t|
+      t.references :project
+      t.references :noteable, polymorphic: true
+      t.references :recipient
+      t.string :commit_id
+      t.string :reply_key, null: false
+    end
+
+    add_index :sent_notifications, :reply_key, unique: true
+  end
+end
diff --git a/db/migrate/20150824002011_add_enable_ssl_verification.rb b/db/migrate/20150824002011_add_enable_ssl_verification.rb
new file mode 100644
index 00000000000..093c068fbde
--- /dev/null
+++ b/db/migrate/20150824002011_add_enable_ssl_verification.rb
@@ -0,0 +1,5 @@
+class AddEnableSslVerification < ActiveRecord::Migration
+  def change
+    add_column :web_hooks, :enable_ssl_verification, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7a0c92bddcd..7ee1c6e2146 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: 20150817163600) do
+ActiveRecord::Schema.define(version: 20150824002011) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -405,6 +405,17 @@ ActiveRecord::Schema.define(version: 20150817163600) do
 
   add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
 
+  create_table "sent_notifications", force: true do |t|
+    t.integer "project_id"
+    t.integer "noteable_id"
+    t.string  "noteable_type"
+    t.integer "recipient_id"
+    t.string  "commit_id"
+    t.string  "reply_key",     null: false
+  end
+
+  add_index "sent_notifications", ["reply_key"], name: "index_sent_notifications_on_reply_key", unique: true, using: :btree
+
   create_table "services", force: true do |t|
     t.string   "type"
     t.string   "title"
@@ -515,13 +526,9 @@ ActiveRecord::Schema.define(version: 20150817163600) do
     t.string   "unconfirmed_email"
     t.boolean  "hide_no_ssh_key",               default: false
     t.string   "website_url",                   default: "",    null: false
-    t.string   "github_access_token"
-    t.string   "gitlab_access_token"
     t.string   "notification_email"
     t.boolean  "hide_no_password",              default: false
     t.boolean  "password_automatically_set",    default: false
-    t.string   "bitbucket_access_token"
-    t.string   "bitbucket_access_token_secret"
     t.string   "location"
     t.string   "encrypted_otp_secret"
     t.string   "encrypted_otp_secret_iv"
@@ -559,13 +566,14 @@ ActiveRecord::Schema.define(version: 20150817163600) do
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "type",                  default: "ProjectHook"
+    t.string   "type",                    default: "ProjectHook"
     t.integer  "service_id"
-    t.boolean  "push_events",           default: true,          null: false
-    t.boolean  "issues_events",         default: false,         null: false
-    t.boolean  "merge_requests_events", default: false,         null: false
-    t.boolean  "tag_push_events",       default: false
-    t.boolean  "note_events",           default: false,         null: false
+    t.boolean  "push_events",             default: true,          null: false
+    t.boolean  "issues_events",           default: false,         null: false
+    t.boolean  "merge_requests_events",   default: false,         null: false
+    t.boolean  "tag_push_events",         default: false
+    t.boolean  "note_events",             default: false,         null: false
+    t.boolean  "enable_ssl_verification", default: false
   end
 
   add_index "web_hooks", ["created_at", "id"], name: "index_web_hooks_on_created_at_and_id", using: :btree