Merge branch 'master' into '24196-protected-variables'

# Conflicts:
#   db/schema.rb

5 files changed, 46 insertions, 13 deletions

diff --git a/db/migrate/20170317203554_index_routes_path_for_like.rb b/db/migrate/20170317203554_index_routes_path_for_like.rb
index 7ac09b2abe5..8d3609135d0 100644
--- a/db/migrate/20170317203554_index_routes_path_for_like.rb
+++ b/db/migrate/20170317203554_index_routes_path_for_like.rb
@@ -21,9 +21,8 @@ class IndexRoutesPathForLike < ActiveRecord::Migration
 
   def down
     return unless Gitlab::Database.postgresql?
+    return unless index_exists?(:routes, :path, name: INDEX_NAME)
 
-    if index_exists?(:routes, :path, name: INDEX_NAME)
-      execute("DROP INDEX CONCURRENTLY #{INDEX_NAME};")
-    end
+    remove_concurrent_index_by_name(:routes, INDEX_NAME)
   end
 end
diff --git a/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb b/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb
index 9d4380ef960..84635fa39b9 100644
--- a/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb
+++ b/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb
@@ -11,13 +11,7 @@ class RemoveIndexForUsersCurrentSignInAt < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
-    if index_exists? :users, :current_sign_in_at
-      if Gitlab::Database.postgresql?
-        execute 'DROP INDEX CONCURRENTLY index_users_on_current_sign_in_at;'
-      else
-        remove_concurrent_index :users, :current_sign_in_at
-      end
-    end
+    remove_concurrent_index :users, :current_sign_in_at
   end
 
   def down
diff --git a/db/migrate/20170427103502_create_web_hook_logs.rb b/db/migrate/20170427103502_create_web_hook_logs.rb
new file mode 100644
index 00000000000..3643c52180c
--- /dev/null
+++ b/db/migrate/20170427103502_create_web_hook_logs.rb
@@ -0,0 +1,22 @@
+# rubocop:disable all
+class CreateWebHookLogs < ActiveRecord::Migration
+  DOWNTIME = false
+
+  def change
+    create_table :web_hook_logs do |t|
+      t.references :web_hook, null: false, index: true, foreign_key: { on_delete: :cascade }
+
+      t.string :trigger
+      t.string :url
+      t.text :request_headers
+      t.text :request_data
+      t.text :response_headers
+      t.text :response_body
+      t.string :response_status
+      t.float :execution_duration
+      t.string :internal_error_message
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20170503185032_index_redirect_routes_path_for_like.rb b/db/migrate/20170503185032_index_redirect_routes_path_for_like.rb
index 5b8b6c828be..8eb20faa03a 100644
--- a/db/migrate/20170503185032_index_redirect_routes_path_for_like.rb
+++ b/db/migrate/20170503185032_index_redirect_routes_path_for_like.rb
@@ -21,9 +21,8 @@ class IndexRedirectRoutesPathForLike < ActiveRecord::Migration
 
   def down
     return unless Gitlab::Database.postgresql?
+    return unless index_exists?(:redirect_routes, :path, name: INDEX_NAME)
 
-    if index_exists?(:redirect_routes, :path, name: INDEX_NAME)
-      execute("DROP INDEX CONCURRENTLY #{INDEX_NAME};")
-    end
+    remove_concurrent_index_by_name(:redirect_routes, INDEX_NAME)
   end
 end
diff --git a/db/migrate/20170523091700_add_rss_token_to_users.rb b/db/migrate/20170523091700_add_rss_token_to_users.rb
new file mode 100644
index 00000000000..06a85f6ac3d
--- /dev/null
+++ b/db/migrate/20170523091700_add_rss_token_to_users.rb
@@ -0,0 +1,19 @@
+class AddRssTokenToUsers < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column :users, :rss_token, :string
+
+    add_concurrent_index :users, :rss_token
+  end
+
+  def down
+    remove_concurrent_index :users, :rss_token if index_exists? :users, :rss_token
+
+    remove_column :users, :rss_token
+  end
+end