fix conflictdocs-topic-auth

5 files changed, 77 insertions, 33 deletions

diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb
index 4bc735916c1..0d7eb1a7c93 100644
--- a/db/fixtures/development/17_cycle_analytics.rb
+++ b/db/fixtures/development/17_cycle_analytics.rb
@@ -223,7 +223,9 @@ class Gitlab::Seeder::CycleAnalytics
 end
 
 Gitlab::Seeder.quiet do
-  if ENV['SEED_CYCLE_ANALYTICS']
+  flag = 'SEED_CYCLE_ANALYTICS'
+
+  if ENV[flag]
     Project.all.each do |project|
       seeder = Gitlab::Seeder::CycleAnalytics.new(project)
       seeder.seed!
@@ -235,6 +237,6 @@ Gitlab::Seeder.quiet do
     seeder = Gitlab::Seeder::CycleAnalytics.new(Project.order(:id).first, perf: true)
     seeder.seed_metrics!
   else
-    puts "Not running the cycle analytics seed file. Use the `SEED_CYCLE_ANALYTICS` environment variable to enable it."
+    puts "Skipped. Use the `#{flag}` environment variable to enable."
   end
 end
diff --git a/db/fixtures/development/20_nested_groups.rb b/db/fixtures/development/20_nested_groups.rb
index d8dddc3fee9..2bc78e120a5 100644
--- a/db/fixtures/development/20_nested_groups.rb
+++ b/db/fixtures/development/20_nested_groups.rb
@@ -27,43 +27,49 @@ end
 
 Sidekiq::Testing.inline! do
   Gitlab::Seeder.quiet do
-    project_urls = [
-     'https://android.googlesource.com/platform/hardware/broadcom/libbt.git',
-     'https://android.googlesource.com/platform/hardware/broadcom/wlan.git',
-     'https://android.googlesource.com/platform/hardware/bsp/bootloader/intel/edison-u-boot.git',
-     'https://android.googlesource.com/platform/hardware/bsp/broadcom.git',
-     'https://android.googlesource.com/platform/hardware/bsp/freescale.git',
-     'https://android.googlesource.com/platform/hardware/bsp/imagination.git',
-     'https://android.googlesource.com/platform/hardware/bsp/intel.git',
-     'https://android.googlesource.com/platform/hardware/bsp/kernel/common/v4.1.git',
-     'https://android.googlesource.com/platform/hardware/bsp/kernel/common/v4.4.git'
-    ]
+    flag = 'SEED_NESTED_GROUPS'
 
-    user = User.admins.first
+    if ENV[flag]
+      project_urls = [
+        'https://android.googlesource.com/platform/hardware/broadcom/libbt.git',
+        'https://android.googlesource.com/platform/hardware/broadcom/wlan.git',
+        'https://android.googlesource.com/platform/hardware/bsp/bootloader/intel/edison-u-boot.git',
+        'https://android.googlesource.com/platform/hardware/bsp/broadcom.git',
+        'https://android.googlesource.com/platform/hardware/bsp/freescale.git',
+        'https://android.googlesource.com/platform/hardware/bsp/imagination.git',
+        'https://android.googlesource.com/platform/hardware/bsp/intel.git',
+        'https://android.googlesource.com/platform/hardware/bsp/kernel/common/v4.1.git',
+        'https://android.googlesource.com/platform/hardware/bsp/kernel/common/v4.4.git'
+      ]
 
-    project_urls.each_with_index do |url, i|
-      full_path = url.sub('https://android.googlesource.com/', '')
-      full_path = full_path.sub(/\.git\z/, '')
-      full_path, _, project_path = full_path.rpartition('/')
-      group = Group.find_by_full_path(full_path) || create_group_with_parents(user, full_path)
+      user = User.admins.first
 
-      params = {
-        import_url: url,
-        namespace_id: group.id,
-        path: project_path,
-        name: project_path,
-        description: FFaker::Lorem.sentence,
-        visibility_level: Gitlab::VisibilityLevel.values.sample
-      }
+      project_urls.each_with_index do |url, i|
+        full_path = url.sub('https://android.googlesource.com/', '')
+        full_path = full_path.sub(/\.git\z/, '')
+        full_path, _, project_path = full_path.rpartition('/')
+        group = Group.find_by_full_path(full_path) || create_group_with_parents(user, full_path)
 
-      project = Projects::CreateService.new(user, params).execute
-      project.send(:_run_after_commit_queue)
+        params = {
+          import_url: url,
+          namespace_id: group.id,
+          path: project_path,
+          name: project_path,
+          description: FFaker::Lorem.sentence,
+          visibility_level: Gitlab::VisibilityLevel.values.sample
+        }
 
-      if project.valid?
-        print '.'
-      else
-        print 'F'
+        project = Projects::CreateService.new(user, params).execute
+        project.send(:_run_after_commit_queue)
+
+        if project.valid?
+          print '.'
+        else
+          print 'F'
+        end
       end
+    else
+      puts "Skipped. Use the `#{flag}` environment variable to enable."
     end
   end
 end
diff --git a/db/migrate/20170407135259_add_foreigh_key_trigger_requests_trigger.rb b/db/migrate/20170407135259_add_foreigh_key_trigger_requests_trigger.rb
new file mode 100644
index 00000000000..81761c65a9f
--- /dev/null
+++ b/db/migrate/20170407135259_add_foreigh_key_trigger_requests_trigger.rb
@@ -0,0 +1,15 @@
+class AddForeighKeyTriggerRequestsTrigger < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key(:ci_trigger_requests, :ci_triggers, column: :trigger_id)
+  end
+
+  def down
+    remove_foreign_key(:ci_trigger_requests, column: :trigger_id)
+  end
+end
diff --git a/db/post_migrate/20170406142253_migrate_user_project_view.rb b/db/post_migrate/20170406142253_migrate_user_project_view.rb
new file mode 100644
index 00000000000..22f0f2ac200
--- /dev/null
+++ b/db/post_migrate/20170406142253_migrate_user_project_view.rb
@@ -0,0 +1,19 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class MigrateUserProjectView < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  def up
+    update_column_in_batches(:users, :project_view, 2) do |table, query|
+      query.where(table[:project_view].eq(0))
+    end
+  end
+
+  def down
+    # Nothing can be done to restore old values
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3422847d729..5689f7331dc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,6 +12,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20170408033905) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "pg_trgm"
@@ -1356,6 +1357,7 @@ ActiveRecord::Schema.define(version: 20170408033905) do
   add_foreign_key "chat_teams", "namespaces", on_delete: :cascade
   add_foreign_key "ci_builds", "ci_pipelines", column: "auto_canceled_by_id", name: "fk_a2141b1522", on_delete: :nullify
   add_foreign_key "ci_pipelines", "ci_pipelines", column: "auto_canceled_by_id", name: "fk_262d4c2d19", on_delete: :nullify
+  add_foreign_key "ci_trigger_requests", "ci_triggers", column: "trigger_id", name: "fk_b8ec8b7245", on_delete: :cascade
   add_foreign_key "ci_trigger_schedules", "ci_triggers", column: "trigger_id", name: "fk_90a406cc94", on_delete: :cascade
   add_foreign_key "ci_triggers", "users", column: "owner_id", name: "fk_e8e10d1964", on_delete: :cascade
   add_foreign_key "container_repositories", "projects"