Automatic merge of gitlab-org/gitlab-ce master

db/migrate/20190806071559_remove_epic_issues_default_relative_position.rb

@@ -3,8 +3,23 @@
 class RemoveEpicIssuesDefaultRelativePosition < ActiveRecord::Migration[5.2]
   DOWNTIME = false
 
-  def change
-    change_column_null :epic_issues, :relative_position, true
-    change_column_default :epic_issues, :relative_position, from: 1073741823, to: nil
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    # The column won't exist if someone installed EE, downgraded to CE
+    # before it was added in EE, then tries to upgrade CE.
+    if column_exists?(:epic_issues, :relative_position)
+      change_column_null :epic_issues, :relative_position, true
+      change_column_default :epic_issues, :relative_position, from: 1073741823, to: nil
+    else
+      add_column_with_default(:epic_issues, :relative_position, :integer, default: nil, allow_null: true)
+    end
+  end
+
+  def down
+    change_column_default :epic_issues, :relative_position, from: nil, to: 1073741823
+    change_column_null :epic_issues, :relative_position, false
   end
 end

doc/development/documentation/styleguide.md

@@ -85,7 +85,7 @@ The more we reflexively add useful information to the docs, the more (and more s
 
 If you have questions when considering, authoring, or editing docs, ask the Technical Writing team on Slack in `#docs` or in GitLab by mentioning the writer for the applicable [DevOps stage](https://about.gitlab.com/handbook/product/categories/#devops-stages). Otherwise, forge ahead with your best effort. It does not need to be perfect; the team is happy to review and improve upon your content. Please review the [Documentation guidelines](index.md) before you begin your first documentation MR.
 
-Having a knowledge base is any form that is separate from the documentation would be against the docs-first methodology because the content would overlap with the documentation.
+Having a knowledge base in any form that is separate from the documentation would be against the docs-first methodology because the content would overlap with the documentation.
 
 ## Markdown