Signed-off-by: Rémy Coutable <remy@rymai.me>

# Conflicts:
#	app/views/admin/application_settings/show.html.haml
#	app/views/groups/labels/index.html.haml
#	db/schema.rb
#	qa/qa/page/project/show.rb

[ci skip]

Disable project avatar validation if avatar has not changed

Closes #51053

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

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

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

Every time a column in the projects table is changed, the Avatarable concern
would validate that the avatar file size was under 200K.  This not only delays
the database changes, but it also can lead to unrelated failures if the HTTP
request fails for some reason.

Closes #51053

Update rubyzip gem to 1.2.2 (CVE-2018-1000544)

Closes #50930

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

Feature/new merge breadcrumbs

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

Add gitaly_calls to API structured logs

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

Explain how to use a specific identity in a repo

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

Merge branch 'docs-50155-user-added-as-a-reporter-can-not-edit-labels-on-merge-requests' into 'master'

Clarify roles with permission to label Merge Requests

Closes #50155

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

Add search to group labels page

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

Add search to group labels page (EE port)

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

fixes breadcrumbs on new issue page. adds link to issues page.

Closes #50209

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

Conditional partial rendering for EE in application settings

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

Conditional partial rendering for EE in application settings

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

Rails 5: include opclasses in rails 5 schema dump

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

Migrate job artifacts data from `ci_builds` to `ci_job_artifacts` table (with Background migrations)

Closes #46652

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

[QA] Add a new Test::Sanity::Failing scenario that always fails

Closes gitlab-qa#28

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

Merge branch '50991-qa-page-shared-clonepanel-should-be-moved-to-page-component-clonepanel-qa' into 'master'

Resolve "[QA] Page::Shared::ClonePanel should be moved to Page::Component::ClonePanel"

Closes #50991

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

Merge branch 'ee-50991-qa-page-shared-clonepanel-should-be-moved-to-page-component-clonepanel-qa' into 'master'

[EE] [QA] Move Page::Shared::ClonePanel to Page::Component::ClonePanel

Closes gitlab-ce#50991

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

Resolve "Protected Environments follow up: Feature specs"

Closes #7200

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

# Conflicts:
#	.gitlab-ci.yml
#	app/controllers/projects/application_controller.rb

[ci skip]

CE upstream - 2018-09-04 09:22 UTC

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

Restrict reopening locked issues for non authorized issue authors

Closes #39665

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

doc/job_traces.md: the file is job.log

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

Enable JUnit results for rspec

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

EE: Enable JUnit results for rspec

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

Handle fixed dates seperately from selected dates in Epics

Closes #7437

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

Send required object storage PUT headers in /uploads/authorize API

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

Fix bugs/edge cases of JUnitParser

Closes #50960

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