Add latest changes from gitlab-org/gitlab@master

13 files changed, 295 insertions, 22 deletions

diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index b409dc3df4b..8bf716580a5 100644
--- a/CHANGELOG-EE.md
+++ b/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)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f22601325d8..ff3965996f2 100644
--- a/CHANGELOG.md
+++ b/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)
diff --git a/app/assets/javascripts/jobs/components/log/log.vue b/app/assets/javascripts/jobs/components/log/log.vue
index 03a697d11ed..eb0de53f36a 100644
--- a/app/assets/javascripts/jobs/components/log/log.vue
+++ b/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(() => {
diff --git a/changelogs/unreleased/37313-scroll-to-bottom.yml b/changelogs/unreleased/37313-scroll-to-bottom.yml
new file mode 100644
index 00000000000..d7251bd8100
--- /dev/null
+++ b/changelogs/unreleased/37313-scroll-to-bottom.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes job log not scrolling to the bottom
+merge_request:
+author:
+type: fixed
diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile
index af95f9d6f76..c5d02e1d320 100644
--- a/danger/changelog/Dangerfile
+++ b/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")
diff --git a/db/migrate/20191014132931_remove_index_on_snippets_project_id.rb b/db/migrate/20191014132931_remove_index_on_snippets_project_id.rb
index a1d3ffdb8c8..850112b4f0b 100644
--- a/db/migrate/20191014132931_remove_index_on_snippets_project_id.rb
+++ b/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
diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md
index ba104a4c574..34fd97a24ee 100644
--- a/doc/administration/auth/ldap-ee.md
+++ b/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.
diff --git a/doc/administration/troubleshooting/postgresql.md b/doc/administration/troubleshooting/postgresql.md
index d1e2e3488b8..65c6952bf1c 100644
--- a/doc/administration/troubleshooting/postgresql.md
+++ b/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
diff --git a/doc/development/README.md b/doc/development/README.md
index 66df6f46e86..f21f8e0d6a3 100644
--- a/doc/development/README.md
+++ b/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
 
diff --git a/doc/development/cycle_analytics.md b/doc/development/cycle_analytics.md
new file mode 100644
index 00000000000..284645cdae7
--- /dev/null
+++ b/doc/development/cycle_analytics.md
@@ -0,0 +1,246 @@
+# Cycle Analytics development guide
+
+Cycle analytics calculates the time between two arbitrary events recorded on domain objects and provides aggregated statistics about the duration.
+
+## Stage
+
+During development, events occur that move issues and merge requests through different stages of progress until they are considered finished. These stages can be expressed with the `Stage` model.
+
+Example stage:
+
+- Name: Development
+- Start event: Issue created
+- End event: Issue first mentioned in commit
+- Parent: `Group: gitlab-org`
+
+### Events
+
+Events are the smallest building blocks of the cycle analytics feature. A stage consists of two events:
+
+- Start
+- End
+
+These events play a key role in the duration calculation.
+
+Formula: `duration = end_event_time - start_event_time`
+
+To make the duration calculation flexible, each `Event` is implemented as a separate class. They're responsible for defining a timestamp expression that will be used in the calculation query.
+
+#### Implementing an `Event` class
+
+There are a few methods that are required to be implemented, the `StageEvent` base class describes them in great detail. The most important ones are:
+
+- `object_type`
+- `timestamp_projection`
+
+The `object_type` method defines which domain object will be queried for the calculation. Currently two models are allowed:
+
+- `Issue`
+- `MergeRequest`
+
+For the duration calculation the `timestamp_projection` method will be used.
+
+```ruby
+def timestamp_projection
+  # your timestamp expression comes here
+end
+
+# event will use the issue creation time in the duration calculation
+def timestamp_projection
+  Issue.arel_table[:created_at]
+end
+```
+
+NOTE: **Note:**
+More complex expressions are also possible (e.g. using `COALESCE`). Look at the existing event classes for examples.
+
+In some cases, defining the `timestamp_projection` method is not enough. The calculation query should know which table contains the timestamp expression. Each `Event` class is responsible for making modifications to the calculation query to make the `timestamp_projection` work. This usually means joining an additional table.
+
+Example for joining the `issue_metrics` table and using the `first_mentioned_in_commit_at` column as the timestamp expression:
+
+```ruby
+def object_type
+  Issue
+end
+
+def timestamp_projection
+  IssueMetrics.arel_table[:first_mentioned_in_commit_at]
+end
+
+def apply_query_customization(query)
+  # in this case the query attribute will be based on the Issue model: `Issue.where(...)`
+  query.joins(:metrics)
+end
+```
+
+### Validating start and end events
+
+Some start/end event pairs are not "compatible" with each other. For example:
+
+- "Issue created" to "Merge Request created": The event classes are defined on different  domain models, the `object_type` method is different.
+- "Issue closed" to "Issue created": Issue must be created first before it can be  closed.
+- "Issue closed" to "Issue closed": Duration is always 0.
+
+The `StageEvents` module describes the allowed `start_event` and `end_event` pairings (`PAIRING_RULES` constant). If a new event is added, it needs to be registered in this module.
+​To add a new event:​
+
+1. Add an entry in `ENUM_MAPPING` with a unique number, it'll be used in the `Stage` model as `enum`.
+1. Define which events are compatible with the event in the `PAIRING_RULES` hash.
+
+Supported start/end event pairings:
+
+```mermaid
+graph LR;
+  IssueCreated --> IssueClosed;
+  IssueCreated --> IssueFirstAddedToBoard;
+  IssueCreated --> IssueFirstAssociatedWithMilestone;
+  IssueCreated --> IssueFirstMentionedInCommit;
+  IssueCreated --> IssueLastEdited;
+  IssueCreated --> IssueLabelAdded;
+  IssueCreated --> IssueLabelRemoved;
+  MergeRequestCreated --> MergeRequestMerged;
+  MergeRequestCreated --> MergeRequestClosed;
+  MergeRequestCreated --> MergeRequestFirstDeployedToProduction;
+  MergeRequestCreated --> MergeRequestLastBuildStarted;
+  MergeRequestCreated --> MergeRequestLastBuildFinished;
+  MergeRequestCreated --> MergeRequestLastEdited;
+  MergeRequestCreated --> MergeRequestLabelAdded;
+  MergeRequestCreated --> MergeRequestLabelRemoved;
+  MergeRequestLastBuildStarted --> MergeRequestLastBuildFinished;
+  MergeRequestLastBuildStarted --> MergeRequestClosed;
+  MergeRequestLastBuildStarted --> MergeRequestFirstDeployedToProduction;
+  MergeRequestLastBuildStarted --> MergeRequestLastEdited;
+  MergeRequestLastBuildStarted --> MergeRequestMerged;
+  MergeRequestLastBuildStarted --> MergeRequestLabelAdded;
+  MergeRequestLastBuildStarted --> MergeRequestLabelRemoved;
+  MergeRequestMerged --> MergeRequestFirstDeployedToProduction;
+  MergeRequestMerged --> MergeRequestClosed;
+  MergeRequestMerged --> MergeRequestFirstDeployedToProduction;
+  MergeRequestMerged --> MergeRequestLastEdited;
+  MergeRequestMerged --> MergeRequestLabelAdded;
+  MergeRequestMerged --> MergeRequestLabelRemoved;
+  IssueLabelAdded --> IssueLabelAdded;
+  IssueLabelAdded --> IssueLabelRemoved;
+  IssueLabelAdded --> IssueClosed;
+  IssueLabelRemoved --> IssueClosed;
+  IssueFirstAddedToBoard --> IssueClosed;
+  IssueFirstAddedToBoard --> IssueFirstAssociatedWithMilestone;
+  IssueFirstAddedToBoard --> IssueFirstMentionedInCommit;
+  IssueFirstAddedToBoard --> IssueLastEdited;
+  IssueFirstAddedToBoard --> IssueLabelAdded;
+  IssueFirstAddedToBoard --> IssueLabelRemoved;
+  IssueFirstAssociatedWithMilestone --> IssueClosed;
+  IssueFirstAssociatedWithMilestone --> IssueFirstAddedToBoard;
+  IssueFirstAssociatedWithMilestone --> IssueFirstMentionedInCommit;
+  IssueFirstAssociatedWithMilestone --> IssueLastEdited;
+  IssueFirstAssociatedWithMilestone --> IssueLabelAdded;
+  IssueFirstAssociatedWithMilestone --> IssueLabelRemoved;
+  IssueFirstMentionedInCommit --> IssueClosed;
+  IssueFirstMentionedInCommit --> IssueFirstAssociatedWithMilestone;
+  IssueFirstMentionedInCommit --> IssueFirstAddedToBoard;
+  IssueFirstMentionedInCommit --> IssueLastEdited;
+  IssueFirstMentionedInCommit --> IssueLabelAdded;
+  IssueFirstMentionedInCommit --> IssueLabelRemoved;
+  IssueClosed --> IssueLastEdited;
+  IssueClosed --> IssueLabelAdded;
+  IssueClosed --> IssueLabelRemoved;
+  MergeRequestClosed --> MergeRequestFirstDeployedToProduction;
+  MergeRequestClosed --> MergeRequestLastEdited;
+  MergeRequestClosed --> MergeRequestLabelAdded;
+  MergeRequestClosed --> MergeRequestLabelRemoved;
+  MergeRequestFirstDeployedToProduction --> MergeRequestLastEdited;
+  MergeRequestFirstDeployedToProduction --> MergeRequestLabelAdded;
+  MergeRequestFirstDeployedToProduction --> MergeRequestLabelRemoved;
+  MergeRequestLastBuildFinished --> MergeRequestClosed;
+  MergeRequestLastBuildFinished --> MergeRequestFirstDeployedToProduction;
+  MergeRequestLastBuildFinished --> MergeRequestLastEdited;
+  MergeRequestLastBuildFinished --> MergeRequestMerged;
+  MergeRequestLastBuildFinished --> MergeRequestLabelAdded;
+  MergeRequestLastBuildFinished --> MergeRequestLabelRemoved;
+  MergeRequestLabelAdded --> MergeRequestLabelAdded;
+  MergeRequestLabelAdded --> MergeRequestLabelRemoved;
+  MergeRequestLabelRemoved --> MergeRequestLabelAdded;
+  MergeRequestLabelRemoved --> MergeRequestLabelRemoved;
+```
+
+### Parent
+
+Teams and organizations might define their own way of building software, thus stages can be completely different. For each stage, a parent object needs to be defined.
+
+Currently supported parents:
+
+- `Project`
+- `Group`
+
+#### How parent relationship it work
+
+1. User navigates to the cycle analytics page.
+1. User selects a group.
+1. Backend loads the defined stages for the selected group.
+1. Additions and modifications to the stages will be persisted within the selected group only.
+
+### Default stages
+
+The [original implementation](https://gitlab.com/gitlab-org/gitlab/issues/847) of cycle analytics defined 7 stages. These stages are always available for each parent, however altering these stages is not possible.
+​
+To make things efficient and reduce the number of records created, the default stages are expressed as in-memory objects (not persisted). When the user creates a custom stage for the first time, all the stages will be persisted. This behaviour is implemented in the cycle analytics service objects.
+​
+The reason for this was that we'd like to add the abilities to hide and order stages later on.
+
+## Data Collector
+
+`DataCollector` is the central point where the data will be queried from the database. The class always operates on a single stage and consists of the following components:
+
+- `BaseQueryBuilder`:
+  - Responsible for composing the initial query.
+  - Deals with `Stage` specific configuration: events and their query customizations.
+  - Parameters coming from the UI: date ranges.
+- `Median`: Calculates the median duration for a stage using the query from  `BaseQueryBuilder`.
+- `RecordsFetcher`: Loads relevant records for a stage using the query from  `BaseQueryBuilder` and specific `Finder` classes to apply visibility rules.
+- `DataForDurationChart`: Loads calculated durations with the finish time (end event timestamp) for the scatterplot chart.
+
+For a new calculation or a query, implement it as a new method call in the `DataCollector` class.
+
+## Database query
+
+Structure of the database query:
+
+```sql
+SELECT (customized by: Median or RecordsFetcher or DataForDurationChart)
+FROM OBJECT_TYPE (Issue or MergeRequest)
+INNER JOIN (several JOIN statements, depending on the events)
+WHERE
+  (Filter by the PARENT model, example: filter Issues from Project A)
+  (Date range filter based on the OBJECT_TYPE.created_at)
+  (Check if the START_EVENT is earlier than END_EVENT, preventing negative duration)
+```
+
+Structure of the `SELECT` statement for `Median`:
+
+```sql
+SELECT (calculate median from START_EVENT_TIME-END_EVENT_TIME)
+```
+
+Structure of the `SELECT` statement for `DataForDurationChart`:
+
+```sql
+SELECT (START_EVENT_TIME-END_EVENT_TIME) as duration, END_EVENT.timestamp
+```
+
+## High-level overview
+
+- Rails Controller (`Analytics::CycleAnalytics` module): Cycle analytics exposes its data via JSON endpoints, implemented within the `analytics` workspace. Configuring the stages are also implements JSON endpoints (CRUD).
+- Services (`Analytics::CycleAnalytics` module): All `Stage` related actions will be delegated to respective service objects.
+- Models (`Analytics::CycleAnalytics` module): Models are used to persist the `Stage` objects `ProjectStage` and `GroupStage`.
+- Feature classes (`Gitlab::Analytics::CycleAnalytics` module):
+  - Responsible for composing queries and define feature specific busines logic.
+  - `DataCollector`, `Event`, `StageEvents`, etc.
+
+## Testing
+
+Since we have a lots of events and possible pairings, testing each pairing is not possible. The rule is to have at least one test case using an `Event` class.
+
+Writing a test case for a stage using a new `Event` can be challenging since data must be created for both events. To make this a bit simpler, each test case must be implemented in the `data_collector_spec.rb` where the stage is tested through the `DataCollector`. Each test case will be turned into multiple tests, covering the following cases:
+
+- Different parents: `Group` or `Project`
+- Different calculations: `Median`, `RecordsFetcher` or `DataForDurationChart`
diff --git a/doc/user/project/integrations/prometheus_library/nginx_ingress.md b/doc/user/project/integrations/prometheus_library/nginx_ingress.md
index a973f8c757e..93f6dbb0302 100644
--- a/doc/user/project/integrations/prometheus_library/nginx_ingress.md
+++ b/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
 
diff --git a/qa/qa/page/component/issuable/common.rb b/qa/qa/page/component/issuable/common.rb
index cfd8ac1e7c8..9ecc8f73bdb 100644
--- a/qa/qa/page/component/issuable/common.rb
+++ b/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
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index 6ec80b7c9cc..2322b5607b0 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/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