# Conflicts:
#	app/models/ci/build.rb
#	app/workers/all_queues.yml
#	config/sidekiq_queues.yml
#	db/schema.rb
#	locale/gitlab.pot
#	spec/lib/gitlab/import_export/all_models.yml

[ci skip]

Fix scss-lint error

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

Add repository languages for projects

Closes #23931, #34671, #48647, and #47301

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

Add repository languages for projects

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

Enable SCSS linting for EE

Closes #7063

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

Add vanilla JS avatar_helper and update existing avatar helpers

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

Backport CSS changes from gitlab-ee!6638

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

Add license management frontend

Closes #5488

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

Resolve "Clean up changelog for 11.1.3 and 11.1.4"

Closes #49837

[ci skip]

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

Raise timeout for Karma tests to 2 seconds

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

Our friends at GitHub show the programming languages for a long time,
and inspired by that this commit means to create about the same
functionality.

Language detection is done through Linguist, as before, where the
difference is that we cache the result in the database. Also, Gitaly can
incrementaly scan a repository. This is done through a shell out, which
creates overhead of about 3s each run. For now this won't be improved.

Scans are triggered by pushed to the default branch, usually `master`.
However, one exception to this rule the charts page. If we're requesting
this expensive data anyway, we just cache it in the database.

Edge cases where there is no repository, or its empty are caught in the
Repository model. This makes use of Redis caching, which is probably
already loaded.

The added model is called RepositoryLanguage, which will make it harder
if/when GitLab supports multiple repositories per project. However, for
now I think this shouldn't be a concern. Also, Language could be
confused with the i18n languages and felt like the current name was
suiteable too.

Design of the Project#Show page is done with help from @dimitrieh. This
change is not visible to the end user unless detections are done.

Our friends at GitHub show the programming languages for a long time,
and inspired by that this commit means to create about the same
functionality.

Language detection is done through Linguist, as before, where the
difference is that we cache the result in the database. Also, Gitaly can
incrementaly scan a repository. This is done through a shell out, which
creates overhead of about 3s each run. For now this won't be improved.

Scans are triggered by pushed to the default branch, usually `master`.
However, one exception to this rule the charts page. If we're requesting
this expensive data anyway, we just cache it in the database.

Edge cases where there is no repository, or its empty are caught in the
Repository model. This makes use of Redis caching, which is probably
already loaded.

The added model is called RepositoryLanguage, which will make it harder
if/when GitLab supports multiple repositories per project. However, for
now I think this shouldn't be a concern. Also, Language could be
confused with the i18n languages and felt like the current name was
suiteable too.

Design of the Project#Show page is done with help from @dimitrieh. This
change is not visible to the end user unless detections are done.

Added gitlab-pages update instructions.

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

Fix bug setting http headers in Files API

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

Merge branch '49499-list-of-projects-not-loading-when-trying-to-create-an-issue-from-a-board-typeerror' into 'master'

Resolve "List of projects not loading when trying to create an issue from a board (TypeError)"

Closes #49499

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

Port of EE-translations

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

Allow users to set a status

Closes #35463

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

Resolve "Making instance-wide data tools more accessible"

Closes #41416 and #48507

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

Port CE "Making instance-wide data tools more accessible"

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

New Crowdin translations

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

New Crowdin translations

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

Remove fixes for MR refactor regressions from master

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

EE Port of: Remove fixes for MR refactor regressions from master

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

EE version of Runner Features

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

correct error message on helm tiller installation timeout

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

CE upstream - 2018-08-01 12:22 UTC

Closes gitlab-ce#34572

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

Add `runner_unsupported` CI failure

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