Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-04

# Conflicts:
#	.gitlab-ci.yml
#	db/schema.rb
#	lib/gitlab/import_export/import_export.yml

[ci skip]

.gitlab-ci.yml

@@ -1221,6 +1221,10 @@ merge:master:
       - $MERGE_TRAIN_SSH_PUBLIC_KEY
       - $MERGE_TRAIN_SSH_PRIVATE_KEY
       - $MERGE_TRAIN_API_TOKEN
+<<<<<<< HEAD
+=======
+      - $MERGE_FORCE_ENABLE
+>>>>>>> upstream/master
   script:
     - scripts/merge-train
   cache:

db/schema.rb

@@ -213,8 +213,11 @@ ActiveRecord::Schema.define(version: 20181126153547) do
     t.integer "archive_builds_in_seconds"
     t.string "commit_email_hostname"
     t.string "runners_registration_token_encrypted"
+<<<<<<< .merge_file_DEFhlJ
     t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id", using: :btree
     t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id", using: :btree
+=======
+>>>>>>> .merge_file_pKLiIm
     t.index ["usage_stats_set_by_user_id"], name: "index_application_settings_on_usage_stats_set_by_user_id", using: :btree
   end
 
@@ -1797,9 +1800,12 @@ ActiveRecord::Schema.define(version: 20181126153547) do
     t.integer "plan_id"
     t.integer "project_creation_level"
     t.string "runners_token"
+<<<<<<< .merge_file_DEFhlJ
     t.datetime_with_timezone "trial_ends_on"
     t.integer "file_template_project_id"
     t.string "saml_discovery_token"
+=======
+>>>>>>> .merge_file_pKLiIm
     t.string "runners_token_encrypted"
     t.index ["created_at"], name: "index_namespaces_on_created_at", using: :btree
     t.index ["file_template_project_id"], name: "index_namespaces_on_file_template_project_id", using: :btree

doc/install/installation.md

@@ -12,7 +12,7 @@ Since installations from source don't have Runit, Sidekiq can't be terminated an
 
 ## Select Version to Install
 
-Make sure you view [this installation guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) from the branch (version) of GitLab you would like to install (e.g., `11-5-stable`).
+Make sure you view [this installation guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) from the branch (version) of GitLab you would like to install (e.g., `11-6-stable`).
 You can select the branch in the version dropdown in the top left corner of GitLab (below the menu bar).
 
 If the highest number stable branch is unclear please check the [GitLab Blog](https://about.gitlab.com/blog/) for installation guide links by version.
@@ -300,9 +300,9 @@ sudo usermod -aG redis git
 ### Clone the Source
 
     # Clone GitLab repository
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 11-5-stable gitlab
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 11-6-stable gitlab
 
-**Note:** You can change `11-5-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `11-6-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
 ### Configure It
 

lib/gitlab/import_export/import_export.yml

@@ -123,9 +123,12 @@ excluded_attributes:
     - :mirror_overwrites_diverged_branches
     - :description_html
     - :repository_languages
+<<<<<<< HEAD
     - :packages_enabled
     - :mirror_last_update_at
     - :mirror_last_successful_update_at
+=======
+>>>>>>> upstream/master
   namespaces:
     - :runners_token
     - :runners_token_encrypted