# Conflicts:
#	app/assets/stylesheets/pages/builds.scss
#	app/views/layouts/header/_default.html.haml
#	lib/gitlab/background_migration/redact_links.rb
#	spec/models/ci/build_spec.rb

[ci skip]

CE upstream - 2018-10-30 04:22 UTC

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

Resolve "Empty list for links to changed pages in Review App from MR Widget"

Closes #53227

See merge request gitlab-org/gitlab-ce!22665

Enhance performance of counting local LFS objects

Closes gitlab-ee#6067

See merge request gitlab-org/gitlab-ce!22143

Add dynamic timer for delayed jobs in pipelines list

See merge request gitlab-org/gitlab-ce!22621

Fix Pod Log topbar position when perf bar is disabled

Closes #7203

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

Backport ee 7203 sticky logs topbar

See merge request gitlab-org/gitlab-ce!22282

Fixes diff discussions not being fully removed

Closes #53317

See merge request gitlab-org/gitlab-ce!22680

Fix extra merge request versions created from forked merge requests

Closes #53153

See merge request gitlab-org/gitlab-ce!22611

Merge branch '7433-mirroring-repos-direction-select-empty-and-consistency-across-offerings' into 'master'

Remove unneeded can_pull and can_push checks for ee mirror_repos_form

Closes #7433

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

Wait for push before checking for new commit

Closes gitlab-org/quality/staging#14

See merge request gitlab-org/gitlab-ce!22633

When a deployment has no files to show in the dropdown we
fallback to the regular single button for the review app link.

This commit moves the review app link into a component since it's
used twice.

This fixes a bug where a discussion on a none changed line
would not get fully removed and therefore leave the comment row
empty. This was caused by the discussiob being added
to the right when it shouldnt of been

This also fixes a very rare edge case where discussions would get added
twice to diff lines causing a Vue rendering warning

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53317

Fix #53298 JupyterHub restarts should work without errors

Closes #53298

See merge request gitlab-org/gitlab-ce!22671

[CI] Add missing new lines

Closes #8191

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

Fix Review Apps testing guide

See merge request gitlab-org/gitlab-ce!22670

Renaming Secret Variables in the codebase

Closes #49629

See merge request gitlab-org/gitlab-ce!22414

Otherwise jasmine/new-line-before-expect is failing

Adding tests for filtering activities/comments in issues

Closes #51889

See merge request gitlab-org/gitlab-ce!22564

Add an index to the `file_store` column on `lfs_objects`. This makes
counting local objects faster.

Also, there is no longer need to check for objects with `file_store`
being `NULL`. See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18557

---

### Query plans

#### Before & with `NULL`

```
Aggregate  (cost=113495.96..113495.97 rows=1 width=8) (actual time=1691.394..1691.394 rows=1 loops=1)
  ->  Seq Scan on lfs_objects  (cost=0.00..106415.50 rows=2832186 width=0) (actual time=0.012..1312.488 rows=2852607 loops=1)
        Filter: ((file_store = 1) OR (file_store IS NULL))
        Rows Removed by Filter: 131
Planning time: 0.077 ms
Execution time: 1691.433 ms
```

#### Before, without `NULL`

```
Aggregate  (cost=113495.96..113495.97 rows=1 width=8) (actual time=856.423..856.424 rows=1 loops=1)
  ->  Seq Scan on lfs_objects  (cost=0.00..106415.50 rows=2832186 width=0) (actual time=0.012..672.181 rows=2852607 loops=1)
        Filter: (file_store = 1)
        Rows Removed by Filter: 131
Planning time: 0.128 ms
Execution time: 856.470 ms
```

#### After & with `NULL`

```
Aggregate  (cost=68819.95..68819.96 rows=1 width=8) (actual time=583.355..583.355 rows=1 loops=1)
  ->  Index Only Scan using index_lfs_objects_on_file_store on lfs_objects  (cost=0.43..61688.35 rows=2852643 width=0) (actual time=0.028..399.177 rows=2852607 loops=1)
        Filter: ((file_store = 1) OR (file_store IS NULL))
        Rows Removed by Filter: 131
        Heap Fetches: 867
Planning time: 0.096 ms
Execution time: 583.404 ms
```

#### After, without `NULL`

```
Aggregate  (cost=68817.29..68817.30 rows=1 width=8) (actual time=490.550..490.551 rows=1 loops=1)
  ->  Index Only Scan using index_lfs_objects_on_file_store on lfs_objects  (cost=0.43..61685.68 rows=2852643 width=0) (actual time=0.040..311.760 rows=2852607 loops=1)
        Index Cond: (file_store = 1)
        Heap Fetches: 831
Planning time: 0.294 ms
Execution time: 490.590 ms
```

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6067

# Conflicts:
#	app/controllers/projects/issues_controller.rb
#	locale/gitlab.pot
#	spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js

[ci skip]

Fix problem with spec that showed up in EE merge

See merge request gitlab-org/gitlab-ce!22675

CE upstream - 2018-10-29 11:21 UTC

Closes #7760

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

Don't synchronize default branch for pull mirrors

Closes #8108

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

docs: Add deprecation notice for renamed licensed feature

See merge request gitlab-org/gitlab-ce!22575

docs: Add deprecation notice for renamed licensed feature

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

Geo: Stale docs on frequency of Geo replication

Closes #7858

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

Revert to the previous behavior for pull mirrors where the
default branch is not synchronized. Not everyone wants to
mirror the default branch of the upstream repository.

Added a note about machine types

See merge request gitlab-org/gitlab-ce!22572