Resolve "Epics Page Styling is broken"

Closes #6287

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

Fix markdown code highlighting

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

Resolve "Approvers block in new MR page is broken after BS4"

Closes #6288

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

Preload Group plans in EpicsFinder

Closes #6206

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

Enrich Security Reports with more data.

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

Update GitHub import instructions

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

Add additional Consul/Repmgr troubleshoot details

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

Merge branch '6011-geo-deleted-project-events-may-be-skipped-on-the-secondary-when-selective-sync-is-used' into 'master'

Resolve "Geo: Deleted project events may be skipped on the secondary when selective sync is used"

Closes #6011

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

Resolve "Extract EE specific files/lines for lib/gitlab/slash_commands"

Closes #6022

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

Add ability to search wiki titles

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

Create system note on epic date change

Closes #5477

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

Fix attr_encryption key settings (EE port)

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

CE upstream - 2018-06-04 07:27 UTC

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

update Bandit link

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

Update IPs to valid example IPs.

Closes #47197

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

As per: https://tools.ietf.org/html/rfc5737

Resolve "URI::InvalidURIError: bad URI(is not URI?): users/xxx[bot]"

Closes #47193

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

CE upstream - 2018-06-03 23:29 UTC

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

Update selenium-webdriver to 3.12.0

Closes #47183

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

commit e8ecae7e
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Sat Jun 2 11:55:42 2018 +0900

    Reveert   build_relations and simply add a line for creating iid

commit b02b2602
Merge: c89e5784 fe0ebf76
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Sat Jun 2 11:15:53 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit c89e5784
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jun 1 15:46:15 2018 +0900

    Use shared examples for populate spec

commit c418d687
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jun 1 15:41:33 2018 +0900

    Remove unneccesary spec

commit c754b693
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jun 1 15:37:36 2018 +0900

    Clean up presence validation spec

commit f7f60ab5
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jun 1 14:53:00 2018 +0900

    Add spec for variables expressions with pipeline iid

commit 4beeb602
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jun 1 14:36:52 2018 +0900

    Fix populate_spec

commit 272b8dca
Merge: 0e22b50d 50fda506
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jun 1 14:32:40 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 0e22b50d
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed May 30 16:42:55 2018 +0900

    Add spec for variables expression

commit 59e1e971
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed May 30 15:17:09 2018 +0900

    Add build_relations method in  Chain::Populate

commit 09122f93
Merge: 1d20679e 5b1416aa
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed May 30 14:50:09 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 1d20679e
Merge: 8e92e25b 014f5f6a
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Mon May 28 20:01:56 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 8e92e25b
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue May 22 15:21:45 2018 +0900

    Remvoe disable_ddl_transaction! and redandant RecordNotUnique exception rescue

commit f61666c0
Merge: 1c636b80 c6f72ac9
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue May 22 14:32:40 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 1c636b80
Merge: 82a49d0f 60b14e52
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu May 17 15:51:33 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 82a49d0f
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Mon May 14 17:41:56 2018 +0900

    Clarify scope for AtomicInternalId shared spec

commit 1e76f289
Merge: a74184eb 40683268
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Mon May 14 17:20:47 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit a74184eb
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri May 11 16:52:48 2018 +0900

    Fix static analysys

commit 46fa3089
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri May 11 16:49:18 2018 +0900

    Rescue RecordNotUnique when pipeline is created with non-unique iid

commit 910a7d02
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri May 11 15:34:36 2018 +0900

    Remove numericality as it's redandant with integer column and validates nil IID

commit 9ccfcf55
Merge: 6a108b8f 35816eb7
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri May 11 15:07:31 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 6a108b8f
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu May 10 16:22:43 2018 +0900

    Fix ensure_iid! method override problem

commit 30a6fb64
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu May 10 15:56:47 2018 +0900

    Fix atomic internal id spec to allow generate pipeline

commit 40e17727
Merge: 7622f5ab 93498185
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu May 10 14:30:45 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 7622f5ab
Merge: 04dc80db 5b0e96d0
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed May 9 14:46:41 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 04dc80db
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue May 8 16:01:18 2018 +0900

    Fix spec

commit 0af2ab18
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue May 8 14:57:41 2018 +0900

    Decouple to_params from AtomicInternalId concern

commit 632b87a8
Merge: 07d1d8bd 0eb74426
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue May 8 14:32:45 2018 +0900

    Merge branch 'master' into per-project-pipeline-iid

commit 07d1d8bd
Author: Kamil Trzciński <ayufan@ayufan.eu>
Date:   Thu May 3 10:50:57 2018 +0200

    Use **CI_PIPELINE_IID**

commit 58f229af
Author: Kamil Trzciński <ayufan@ayufan.eu>
Date:   Thu May 3 10:48:23 2018 +0200

    Make Atomic Internal ID work for pipelines

commit 35cf604b
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Mon Apr 30 22:25:56 2018 +0900

    Add to_param override to lookup :id path

commit 787eddd5
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Apr 25 22:00:11 2018 +0900

    Revert column name change

commit 8327ad8d
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Apr 25 21:44:05 2018 +0900

    Add changelog

commit 8192cd70
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Apr 25 21:42:46 2018 +0900

    Expose CI_PIPELINE_IID_PER_PROJECT variable

commit 332d3d0e
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Apr 25 21:03:35 2018 +0900

    Change column name to iid_per_project. Add index to project_id and iid

commit 3248ca04
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Apr 24 17:08:43 2018 +0900

    Add per-project pipeline id

Fix missing key change in 20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb