# Conflicts:
#	app/models/members/group_member.rb
#	app/models/members/project_member.rb
#	app/services/notification_service.rb
#	config/initializers/omniauth.rb

[ci skip]

Update index.md

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

Fix typo

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

Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite

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

Ee add jwt strategy to gitlab suite

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

Docs: update Pages for newbies

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

Docs: update Pages for newbies

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

Resolve "Members invitations scheduled before commit"

Closes #45572

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

[EE] Ensure member invitation is sent after its actual creation in the DB

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

Move NotificationService calls to Sidekiq

Closes #43106

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

Move NotificationService calls to Sidekiq

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

CE upstream - 2018-04-29 18:23 UTC

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

Add sha filter to list pipelines

Closes #44880

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

CE upstream - 2018-04-27 18:24 UTC

Closes gitlab-development-kit#342, gitlab-ce#45045, and gitaly#314

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

Fix example config miss-alignment in uploads.object_store.connection

Closes gitlab-development-kit#342

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

CE upstream - 2018-04-27 09:32 UTC

Closes gitlab-ce#45045 and gitlab-qa#183

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

Rescue from `InvalidSignatureTimeError` on Geo API

Closes #5796

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

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

We could revisit which we don't want to run in qa.

Resolve "Add how to use nip.io to Auto DevOps and Kubernetes documentation"

Closes #45561

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

Remove IDE image upload spec

Closes #45045

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

* ee/master:
  Don't run JS lint for QA either
  except is already handled, don't overwrite it
  We still want to run them in QA
  Introduce dedicated-no-docs-and-no-qa-pull-cache-job
  Remove comma from the time system notes
  Wait for page load so we're not getting stale elements
  Clear local storage after test so it's not interfering
  Select everything so we could hit protect
  Geo: Add pgbouncer and FDW documentation

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

Improved specs

Remove comma from the time system notes

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

Remove comma from the time system notes

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

Geo: Add pgbouncer and FDW documentation

Closes #5061

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

Repository#exists? can only be queried with Gitaly

Closes gitaly#314

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

Don't run JS lint report for QA

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