# Conflicts:
#   db/schema.rb

Remove project_mirror_data created_at and updated_at columns

Closes gitlab-qa#237

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

# Conflicts:
#   db/schema.rb

Simplify Geo doc wording

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

# Conflicts:
#	locale/gitlab.pot

[ci skip]

Set `ci_runners.runner_type` not null

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

Fixed empty editors in the IDE

Closes #46153

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

Update the dependencies license list

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

Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates

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

Don't add project_mirror_data columns that have already been added

Closes #5939

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

Adjust spec to build correct path when storage path ends in slash

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

Adjust spec to build correct path when storage path ends in slash

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

CE upstream - 2018-05-08 21:28 UTC

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

Fix `downtime_check` job

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

Docs: document the redirect_to method

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

Docs: add custom descriptions to most relevant docs

Closes gitlab-com/gitlab-docs#200

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

Docs: add custom descriptions to most relevant docs

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

Stop presenting burndown charts promotion for grouped milestones

Closes gitlab-ce#46129

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

In !5586, some `add_column` statements were moved between migrations.
If the original migrations were already run on a user's instance,
the new migrations would try to add the columns again.

(cherry picked from commit 7b8d754e)

Closes #46153

Add docs for group runners

Closes #10244

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

Updates Clair container scanning GitLab CI configuration

Closes #45819

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

15fcd965 (!18547) squashes old migrations
to a single one.

Old migrations had `rubocop:disable all` rule, but the new migration doesn't
have it, so the `downtime_check` fails.

This commit explicitly tells that the migration requires downtime.

Resolve "Improve i18n of "Runners""

Closes #46115

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