CE upstream - 2018-08-24 18:21 UTC

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

Refactor GitHub Importer database helpers into helper methods

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

Removing not necessarily indentations in update Ruby code block

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

[docs] Update CONTRIBUTING.md

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

POST should be PUT in the API labels specs

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

CE upstream - 2018-08-24 15:22 UTC

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

# Conflicts:
#	app/assets/stylesheets/framework/variables.scss
#	app/assets/stylesheets/pages/environments.scss

[ci skip]

CE upstream - 2018-08-23 09:21 UTC

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

This in preparation for addressing idle-in-transaction timeouts for other importers.

Part of #50021

Add link to Profiling doc to README

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

Allows author to vote on their own issue

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

documentation: fixes to source installation instructions

Closes #47483

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

Fix remote mirrors failing if Git remotes have not been added

Closes #50562

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

Fix transient failure of badge_list_spec.js

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

Backport LDAP changes to CE

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

Geo: Use database-cached status if redis-cached status is unavailable

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

Merge branch '43096-controller-projects-issuescontroller-referenced_merge_requests-json-executes-more-than-100-sql-queries' into 'master'

Resolve "Controller Projects::IssuesController#referenced_merge_requests.json executes more than 100 SQL queries"

Closes #43096

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

Finish cleaning up reassigned variables

Closes #49807

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

Ee remove scss variables 5

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

[Rails5] Use hexadecimal checksum

Closes #6744

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

Use package icon for packages feature in project sidebar

Closes #7303

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

Fixes doc/development/architecture.md prod links.

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

# Conflicts:
#	db/schema.rb
#	spec/lib/gitlab/usage_data_spec.rb

[ci skip]

"/home/git/repositories" in arguments causes Gitaly installation to fail

Speed up diff comparisons by limiting number of commit messages rendered

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

Added count for label, assignee, and milestone lists

Closes #48800

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

Add public/uploads/tmp to allowed upload paths

Closes #49585

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

CE upstream - 2018-08-23 00:21 UTC

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