* master: (69 commits)
  Calculating repository checksums executed by Gitaly
  Resolve "Expand API: Render an arbitrary Markdown document"
  Update EE > CE downgrade service removal steps
  Make stores export a createStore() which can be used in tests
  Simplify pattern lexeme fabrication and matcher
  Simplify untrusted regexp factory method
  Fix api_json.log not always reporting the right HTTP status code
  Move group lists css from framework/lists.scss to pages/groups.scss
  Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar"
  Add Keyboard shortcuts for "Kubernetes" and "Environments"
  Move API group deletion to Sidekiq
  fix typos. add a reference to deliverable and stretch for design artifact
  fix / assigne username wrapping problem has been fixed
  Memoize Gitlab::Database.version
  Conditionally add Gitaly deprecation warnings based on ENV variable
  Bring CE-EE parity to app/services/milestones/base_service.rb
  Bring CE-EE parity to app/services/lfs/unlock_file_service.rb
  Fixes 500 error on /estimate BIG_VALUE
  Fix: Use case in-sensitive ordering by name for groups
  Fix group lists visual
  ...

* master: (24 commits)
  Remove unneccessary imports
  fixed copy to cliboard button in embedded snippets
  Fix Error 500 viewing admin page due to statement timeouts
  Workhorse to send raw diff and patch for commits
  Refactor out duplication in runner_policy.rb
  Remove unnecessary runner.is_shared? checks in api because they are handled by policy
  Allow admin to assign shared runner to project through API
  Change policy list_runner_jobs -> read_runner
  Rename User#ci_authorized_runners -> ci_owned_runners
  Improve efficiency of authorized_runner policy query
  Use can? policies for lib/api/runners.rb
  Allow group runners to be viewed/edited in API
  Whitelisted query limits for group destroy API
  Fixed typo
  Changed order of include
  Use find_in_batches instead of destroy_all
  Delete remote uploads
  Use correct base width
  Refactor duplicate code
  Add changelog entry for contrib graphs width fix
  ...

* master: (79 commits)
  Project Sidebar: Split CI/CD into CI/CD and Operations
  Fix GPM content types for Doorkeeper
  Remove docker pull prefix from registry clipboard feature
  Remove unnecessary section-100 css class from application_row.vue
  Document the 3h timeout for GitLab.com shared Runners
  edit GitLab license info in regards to CC licensing
  Fix bug with long strings in issue boards
  Fix setting Gitlab metrics content types
  Add documentation for bulk editing of issues and merge requests
  Remove authentication for readonly endpoints in issues API
  Remote table-section from div holding cluster error messages
  Improve testing best practices guidelines
  Add a unique and not null constraint on the project_features.project_id column
  fix typos Frontend Guide, development_process.md
  Disable greedy mode when matching filename
  Add index on runner_type for ci_runners
  Improve the squash step in the 'Database Changes' MR template
  Update docs describing `fast_spec_helper` best practices
  Display help text below auto devops domain with nip.io domain name (#45561)
  Enable update_(build|pipeline) for maintainers
  ...

Use less aggressive sticking for DB load balancing

Closes #6041

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

CE upstream - 2018-05-16 18:24 UTC

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

Add jobs to verify that migrating from CE to EE works

Closes #5980

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

# Conflicts:
#	app/controllers/admin/dashboard_controller.rb
#	app/views/admin/dashboard/index.html.haml

[ci skip]

CE upstream - 2018-05-16 15:38 UTC

Closes gitlab-ce#46412

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

Fix contributors graph width

Closes #22647

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

Fix Error 500 viewing admin page due to statement timeouts

Closes #46255

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix Error 500 viewing admin page due to statement timeouts (EE port)

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

fixed copy to cliboard button in embedded snippets

Closes #46303

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

Adjust board lists header text color

Closes #36983

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

Migrates EE-only js components to single file components

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

Previously when performing a write we would stick to the primary for the
duration of a request. This could lead to unnecessary pressure on the
primary database.

To work around this we stop using the primary the moment all secondaries
are in sync with the last write. If we are in an explicit transaction we
will keep using the primary until the transaction finishes.

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/6041

# Conflicts:
#	LICENSE

[ci skip]

Uses PostgreSQL tuple estimates to provide a much faster yet approximate
count. See https://wiki.postgresql.org/wiki/Slow_Counting for more details.
We only use this fast method if the table has been analyzed or vacuumed
within the last hour.

Closes #46255

Uses PostgreSQL tuple estimates to provide a much faster yet approximate
count. See https://wiki.postgresql.org/wiki/Slow_Counting for more details.
We only use this fast method if the table has been analyzed or vacuumed
within the last hour.

Closes #46255

Add specs for geo with terms enforced

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

Add Group's GL.com plan name to payload of system hook

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

Remove table-section from div holding cluster error messages

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

edit GitLab license info in regards to CC licensing

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

CE upstream - 2018-05-16 12:32 UTC

Closes gitaly#540

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

Never drop the database when granting privileges

We're not trying to reuse the commands here because:

* Avoid touching CE tasks
* Allow them to evolve independently if needed
* It's nice to have highlighted command lines history

Move discussion and notes actions to the right

Closes #33645

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

Fix GitLab Performance Monitoring content types for Doorkeeper

Closes #46412

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

# Conflicts:
#	app/views/layouts/nav/sidebar/_project.html.haml
#	locale/gitlab.pot

[ci skip]

Project Sidebar: Split CI/CD into CI/CD and Operations

Closes #43673

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