# Conflicts:
#	app/views/admin/application_settings/show.html.haml
#	db/schema.rb

[ci skip]

Fix branch API can_push attribute and add specs

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

Resolve "Explain what Groups are in the New Group page"

Closes #47221

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

Add André Gama as proofreader in Brazilian Portuguese.

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

Port gitlab-ee!5532 to CE

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

Add a helper to rename a column using a background migration

Closes #47591

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

CE upstream - 2018-06-26 13:51 UTC

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

Add index on deployable_type/id for deployments

Closes #48380

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

Move repo backup RPC's to opt-out

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

Resolve "Wiki page returns error code 502"

Closes #48269

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

replaces jira_dev_panel_gl_setup_1.png with a fresh version

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

Update _scopes_form.html.haml to remove duplicate information

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

Specify users need to first upgrade to latest available version in major version series

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

Use the branch instead of the tag to install

Closes #48341

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

CE upstream - 2018-06-26 09:22 UTC

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

Resolve "Removed omniauth provider causing invalid application setting"

Closes #46783

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

Poll Geo secondary node readiness API in QA tests

Closes #6514

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

i18n: externalize strings from 'app/views/projects/deployments'

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

Update pipeline icon in web ide sidebar

Closes #48206

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

This works the same way as change_column_type_using_background_migration, but
for renaming a column. It takes a table, not a relation, to match its concurrent
counterpart.

Also, generalise the cleanup migrations to reduce code duplication.

i18n: externalize strings from 'app/views/admin/labels'

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

Rails5 fix arel from in mysql_median_datetime_sql

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

Fix refresh cache for open issues count service

Closes #47945

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

Improve comment on Rails database password

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

`Nokogiri::XML::Node#ancestors` appears to be much slower than
`HTML::Pipeline::Filter#has_ancestor?` for these purposes. We already use
`#has_ancestor?` elsewhere, so this change also makes this filter more
consistent with other banzai filters.

Move some EE only codes in models to their EE modules

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

CE:  Move some EE only codes in models to their EE modules

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

Resolve conflicts in app/views/shared/boards/_show.html.haml and app/views/shared/boards/components/_board.html.haml
Signed-off-by: Rémy Coutable <remy@rymai.me>

Update wrong initial setting transfer in application_settings_controller.rb

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

# Conflicts:
#	app/views/shared/boards/_show.html.haml
#	app/views/shared/boards/components/_board.html.haml

[ci skip]