# 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

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

Remote mirrors only get created when the URL changes, However, during the GCP
migration, the remote mirror did not get created automatically. Plus, there's
no guarantee someone restoring a repository from backup would have this
remote. We now add the remote each time we attempt to fetch from the
repository.

This works because Gitaly doesn't throw up an exception or error if the
remote already exists:
https://gitlab.com/gitlab-org/gitaly/issues/1317

In the future, we should attempt to add if the remote doesn't exist:
https://gitlab.com/gitlab-org/gitaly/issues/1316

Closes #50562

[ci skip]

[ci skip]

[ci skip]

CE upstream - 2018-08-22 21:21 UTC

Closes gitlab-ce#49971

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

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

Merge branch '7309-geo-secondary-with-ldap-configured-can-t-update-last_credential_check_at-due-to-read-only-db' into 'master'

Resolve "Geo:  Secondary with LDAP configured can't update last_credential_check_at due to read-only DB"

Closes #7309

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

Fix broken Git over HTTP clones with LDAP users

Closes #50579

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