Merge branch 'ce-to-ee-2018-05-04' into 'master'

CE upstream - 2018-05-04 21:23 UTC

See merge request gitlab-org/gitlab-ee!5586

app/assets/stylesheets/pages/repo.scss

@@ -440,6 +440,7 @@
   padding-right: 3px;
 
   .projects-sidebar {
+    min-height: 0;
     display: flex;
     flex-direction: column;
     flex: 1;

app/services/web_hook_service.rb

@@ -41,7 +41,7 @@ class WebHookService
       http_status: response.code,
       message: response.to_s
     }
-  rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout => e
+  rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout, Gitlab::HTTP::BlockedUrlError => e
     log_execution(
       trigger: hook_name,
       url: hook.url,

changelogs/unreleased/dm-webhook-catch-blocked-url-exception.yml

+---
+title: Ensure web hook 'blocked URL' errors are stored in web hook logs and properly
+  surfaced to the user
+merge_request:
+author:
+type: fixed

db/migrate/20180502122856_create_project_mirror_data.rb

+class CreateProjectMirrorData < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    if table_exists?(:project_mirror_data)
+      add_column :project_mirror_data, :status, :string
+      add_column :project_mirror_data, :jid, :string
+      add_column :project_mirror_data, :last_error, :text
+    else
+      create_table :project_mirror_data do |t|
+        t.references :project, index: true, foreign_key: { on_delete: :cascade }
+        t.string :status
+        t.string :jid
+        t.text :last_error
+      end
+    end
+  end
+
+  def down
+    remove_column :project_mirror_data, :status
+    remove_column :project_mirror_data, :jid
+    remove_column :project_mirror_data, :last_error
+
+    # ee/db/migrate/20170509153720_create_project_mirror_data_ee.rb will remove the table.
+  end
+end

db/migrate/20180503154922_add_indexes_to_project_mirror_data.rb → db/migrate/20180503175054_add_indexes_to_project_mirror_data.rb

@@ -6,13 +6,11 @@ class AddIndexesToProjectMirrorData < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
-    add_concurrent_index :project_mirror_data, :last_successful_update_at
     add_concurrent_index :project_mirror_data, :jid
     add_concurrent_index :project_mirror_data, :status
   end
 
   def down
-    remove_index :project_mirror_data, :last_successful_update_at if index_exists? :project_mirror_data, :last_successful_update_at
     remove_index :project_mirror_data, :jid if index_exists? :project_mirror_data, :jid
     remove_index :project_mirror_data, :status if index_exists? :project_mirror_data, :status
   end

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: 20180503154922) do
+ActiveRecord::Schema.define(version: 20180503175054) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

ee/db/migrate/20170509153720_create_project_mirror_data.rb

-class CreateProjectMirrorData < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  disable_ddl_transaction!
-
-  def up
-    execute <<-SQL
-      CREATE TABLE project_mirror_data
-      AS (
-        SELECT id AS project_id,
-          0 AS retry_count,
-          CAST(NULL AS #{timestamp}) AS last_update_started_at,
-          CAST(NULL AS #{timestamp}) AS last_update_scheduled_at,
-          NOW() AS next_execution_timestamp,
-          NOW() AS created_at,
-          NOW() AS updated_at
-        FROM projects
-        WHERE mirror IS TRUE
-      );
-    SQL
-
-    add_column :project_mirror_data, :id, :primary_key
-    change_column_default :project_mirror_data, :retry_count, 0
-    change_column_null :project_mirror_data, :retry_count, false
-    add_concurrent_foreign_key :project_mirror_data, :projects, column: :project_id
-    add_concurrent_index :project_mirror_data, [:project_id], unique: true
-  end
-
-  def down
-    drop_table :project_mirror_data if table_exists?(:project_mirror_data)
-  end
-
-  def timestamp
-    return 'TIMESTAMP' if Gitlab::Database.postgresql?
-
-    'DATETIME'
-  end
-end

ee/db/migrate/20170509153720_create_project_mirror_data_ee.rb

+class CreateProjectMirrorDataEE < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    # When moving from CE to EE, project_mirror_data may already exist, but will
+    # not have all the required columns.
+    if table_exists?(:project_mirror_data)
+      add_column_with_default :project_mirror_data, :retry_count, :integer, default: 0, allow_null: false
+      add_column :project_mirror_data, :last_update_started_at, :datetime_with_timezone
+      add_column :project_mirror_data, :last_update_scheduled_at, :datetime_with_timezone
+      add_column :project_mirror_data, :next_execution_timestamp, :datetime_with_timezone
+    else
+      execute <<-SQL
+        CREATE TABLE project_mirror_data
+        AS (
+          SELECT id AS project_id,
+            0 AS retry_count,
+            CAST(NULL AS #{timestamp}) AS last_update_started_at,
+            CAST(NULL AS #{timestamp}) AS last_update_scheduled_at,
+            NOW() AS next_execution_timestamp,
+            NOW() AS created_at,
+            NOW() AS updated_at
+          FROM projects
+          WHERE mirror IS TRUE
+        );
+      SQL
+
+      add_column :project_mirror_data, :id, :primary_key
+      change_column_default :project_mirror_data, :retry_count, 0
+      change_column_null :project_mirror_data, :retry_count, false
+      add_concurrent_foreign_key :project_mirror_data, :projects, column: :project_id
+      add_concurrent_index :project_mirror_data, [:project_id], unique: true
+    end
+  end
+
+  def down
+    drop_table :project_mirror_data if table_exists?(:project_mirror_data)
+  end
+
+  def timestamp
+    return 'TIMESTAMP' if Gitlab::Database.postgresql?
+
+    'DATETIME'
+  end
+end

ee/db/migrate/20180430134556_migrate_import_attributes_from_project_to_project_mirror_data.rb → ee/db/migrate/20180502124117_add_missing_columns_to_project_mirror_data.rb

-class MigrateImportAttributesFromProjectToProjectMirrorData < ActiveRecord::Migration
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddMissingColumnsToProjectMirrorData < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
-    add_column :project_mirror_data, :status, :string
-    add_column :project_mirror_data, :jid, :string
     add_column :project_mirror_data, :last_update_at, :datetime_with_timezone
     add_column :project_mirror_data, :last_successful_update_at, :datetime_with_timezone
-    add_column :project_mirror_data, :last_error, :text
   end
 
   def down
-    remove_column :project_mirror_data, :status
-    remove_column :project_mirror_data, :jid
     remove_column :project_mirror_data, :last_update_at
     remove_column :project_mirror_data, :last_successful_update_at
-    remove_column :project_mirror_data, :last_error
   end
 end

ee/db/migrate/20180503154922_add_indexes_to_project_mirror_data_ee.rb

+class AddIndexesToProjectMirrorDataEE < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :project_mirror_data, :last_successful_update_at
+  end
+
+  def down
+    remove_index :project_mirror_data, :last_successful_update_at if index_exists? :project_mirror_data, :last_successful_update_at
+  end
+end

ee/spec/migrations/migrate_mirror_attributes_data_from_projects_to_import_state_spec.rb

 require 'spec_helper'
-require Rails.root.join('ee', 'db', 'post_migrate', '20180430180136_migrate_mirror_attributes_data_from_projects_to_import_state.rb')
+require Rails.root.join('ee', 'db', 'post_migrate', '20180502130136_migrate_mirror_attributes_data_from_projects_to_import_state.rb')
 
 describe MigrateMirrorAttributesDataFromProjectsToImportState, :migration do
   let(:namespaces) { table(:namespaces) }

lib/gitlab/legacy_github_import/importer.rb

@@ -79,7 +79,6 @@ module Gitlab
         return unless errors.any?
 
         project.ensure_import_state
-
         project.import_state&.update_column(:last_error, {
           message: 'The remote data could not be fully imported.',
           errors: errors

spec/lib/gitlab/background_migration/populate_import_state_spec.rb

 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::PopulateImportState, :migration, schema: 20180430144643 do
+describe Gitlab::BackgroundMigration::PopulateImportState, :migration, schema: 20180502134117 do
   let(:migration) { described_class.new }
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }

spec/lib/gitlab/background_migration/rollback_import_state_data_spec.rb

 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::RollbackImportStateData, :migration, schema: 20180430144643 do
+describe Gitlab::BackgroundMigration::RollbackImportStateData, :migration, schema: 20180502134117 do
   let(:migration) { described_class.new }
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }

spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb

 require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180430144643_migrate_import_attributes_data_from_projects_to_project_mirror_data.rb')
+require Rails.root.join('db', 'post_migrate', '20180502134117_migrate_import_attributes_data_from_projects_to_project_mirror_data.rb')
 
 describe MigrateImportAttributesDataFromProjectsToProjectMirrorData, :sidekiq, :migration do
   let(:namespaces) { table(:namespaces) }

spec/services/web_hook_service_spec.rb

@@ -67,7 +67,7 @@ describe WebHookService do
     end
 
     it 'handles exceptions' do
-      exceptions = [SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout]
+      exceptions = [SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout, Gitlab::HTTP::BlockedUrlError]
       exceptions.each do |exception_class|
         exception = exception_class.new('Exception message')