Add latest changes from gitlab-org/gitlab@master

CHANGELOG-EE.md

@@ -98,6 +98,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Remove IIFEs from jira_connect.js file. !19248 (nuwe1)
 
 
+## 12.4.5
+
+- No changes.
+
 ## 12.4.3
 
 ### Fixed (2 changes)

CHANGELOG.md

@@ -370,6 +370,10 @@ entry.
 - Change selects from default browser style to custom style.
 
 
+## 12.4.5
+
+- No changes.
+
 ## 12.4.3
 
 ### Fixed (2 changes)

app/assets/javascripts/jobs/components/log/log.vue

@@ -9,7 +9,12 @@ export default {
     LogLine,
   },
   computed: {
-    ...mapState(['traceEndpoint', 'trace', 'isTraceComplete']),
+    ...mapState([
+      'traceEndpoint',
+      'trace',
+      'isTraceComplete',
+      'isScrolledToBottomBeforeReceivingTrace',
+    ]),
   },
   updated() {
     this.$nextTick(() => {

changelogs/unreleased/37313-scroll-to-bottom.yml

+---
+title: Fixes job log not scrolling to the bottom
+merge_request:
+author:
+type: fixed

danger/changelog/Dangerfile

@@ -29,6 +29,10 @@ def ce_port_changelog?(changelog_path)
   helper.ee? && !ee_changelog?(changelog_path)
 end
 
+def docs_only_change?
+  helper.changes_by_category.keys == [:docs]
+end
+
 def check_changelog(path)
   yaml = YAML.safe_load(File.read(path))
 
@@ -55,7 +59,7 @@ def sanitized_mr_title
   gitlab.mr_json["title"].gsub(/^WIP: */, '').gsub(/`/, '\\\`')
 end
 
-changelog_needed = (gitlab.mr_labels & NO_CHANGELOG_LABELS).empty?
+changelog_needed = !docs_only_change? && (gitlab.mr_labels & NO_CHANGELOG_LABELS).empty?
 changelog_found = git.added_files.find { |path| path =~ %r{\A(ee/)?(changelogs/unreleased)(-ee)?/} }
 
 if git.modified_files.include?("CHANGELOG.md")

db/migrate/20191014132931_remove_index_on_snippets_project_id.rb

@@ -8,10 +8,13 @@ class RemoveIndexOnSnippetsProjectId < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up
-    remove_concurrent_index :snippets, [:project_id]
+    remove_concurrent_index_by_name :snippets, 'index_snippets_on_project_id'
+
+    # This is an extra index that is not present in db/schema.rb but known to exist on some installs
+    remove_concurrent_index_by_name :snippets, :snippets_project_id_idx if index_exists_by_name? :snippets, :snippets_project_id_idx
   end
 
   def down
-    add_concurrent_index :snippets, [:project_id]
+    add_concurrent_index :snippets, [:project_id], name: 'index_snippets_on_project_id'
   end
 end

doc/administration/auth/ldap-ee.md

@@ -19,7 +19,7 @@ NOTE: **Note:**
 - Group sync: Once an hour, GitLab will update group membership
   based on LDAP group members.
 
-## Multiple LDAP servers **(STARTER ONLY)**
+## Multiple LDAP servers
 
 With GitLab Enterprise Edition Starter, you can configure multiple LDAP servers
 that your GitLab instance will connect to.

doc/administration/troubleshooting/postgresql.md

@@ -58,30 +58,30 @@ This section is for links to information elsewhere in the GitLab documentation.
   - required extension pg_trgm
   - required extension postgres_fdw for Geo
 
-- Errors like this in the `production / Sidekiq` log; see: [Set default_transaction_isolation into read committed](https://docs.gitlab.com/omnibus/settings/database.html#set-default_transaction_isolation-into-read-committed)
+- Errors like this in the `production/sidekiq` log; see: [Set default_transaction_isolation into read committed](https://docs.gitlab.com/omnibus/settings/database.html#set-default_transaction_isolation-into-read-committed):
 
-```
-ActiveRecord::StatementInvalid PG::TRSerializationFailure: ERROR:  could not serialize access due to concurrent update
-```
+  ```plaintext
+  ActiveRecord::StatementInvalid PG::TRSerializationFailure: ERROR:  could not serialize access due to concurrent update
+  ```
 
-- PostgreSQL HA - [replication slot errors](https://docs.gitlab.com/omnibus/settings/database.html#troubleshooting-upgrades-in-an-ha-cluster)
+- PostgreSQL HA - [replication slot errors](https://docs.gitlab.com/omnibus/settings/database.html#troubleshooting-upgrades-in-an-ha-cluster):
 
-```
-pg_basebackup: could not create temporary replication slot "pg_basebackup_12345": ERROR:  all replication slots are in use
-HINT:  Free one or increase max_replication_slots.
-```
+  ```plaintext
+  pg_basebackup: could not create temporary replication slot "pg_basebackup_12345": ERROR:  all replication slots are in use
+  HINT:  Free one or increase max_replication_slots.
+  ```
 
 - GEO [replication errors](../geo/replication/troubleshooting.md#fixing-replication-errors) including:
 
-```
-ERROR: replication slots can only be used if max_replication_slots > 0
+  ```plaintext
+  ERROR: replication slots can only be used if max_replication_slots > 0
 
-FATAL: could not start WAL streaming: ERROR: replication slot “geo_secondary_my_domain_com” does not exist
+  FATAL: could not start WAL streaming: ERROR: replication slot “geo_secondary_my_domain_com” does not exist
 
-Command exceeded allowed execution time
+  Command exceeded allowed execution time
 
-PANIC: could not write to file ‘pg_xlog/xlogtemp.123’: No space left on device
-```
+  PANIC: could not write to file ‘pg_xlog/xlogtemp.123’: No space left on device
+  ```
 
 - [Checking GEO configuration](../geo/replication/troubleshooting.md#checking-configuration) including
   - reconfiguring hosts/ports

doc/development/README.md

@@ -69,6 +69,7 @@ description: 'Learn how to contribute to GitLab.'
 - [Developing against interacting components or features](interacting_components.md)
 - [File uploads](uploads.md)
 - [Auto DevOps development guide](auto_devops.md)
+- [Cycle Analytics development guide](cycle_analytics.md)
 
 ## Performance guides
 

doc/user/project/integrations/prometheus_library/nginx_ingress.md

@@ -4,7 +4,7 @@
 
 NOTE: **Note:** NGINX Ingress versions prior to 0.16.0 offer an included [VTS Prometheus metrics exporter](nginx_ingress_vts.md), which exports metrics different than the built-in metrics.
 
-GitLab has support for automatically detecting and monitoring the Kubernetes NGINX Ingress controller. This is provided by leveraging the built-in Prometheus metrics included with Kubernetes NGINX Ingress Controller [version 0.16.0](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#0160) onward.
+GitLab has support for automatically detecting and monitoring the Kubernetes NGINX Ingress controller. This is provided by leveraging the built-in Prometheus metrics included with Kubernetes NGINX Ingress controller [version 0.16.0](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#0160) onward.
 
 ## Requirements
 

qa/qa/page/component/issuable/common.rb

@@ -8,6 +8,7 @@ module QA
           def self.included(base)
             base.view 'app/assets/javascripts/issue_show/components/title.vue' do
               element :edit_button
+              element :title, required: true
             end
 
             base.view 'app/assets/javascripts/issue_show/components/fields/title.vue' do

qa/qa/page/project/issue/show.rb

@@ -157,7 +157,7 @@ module QA
 
           def select_filter_with_text(text)
             retry_on_exception do
-              click_body
+              click_element(:title)
               click_element :discussion_filter
               find_element(:filter_options, text: text).click
             end