CE upstream - 2018-09-19 18:26 UTC

Closes gitlab-org/release/framework#16

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

Improve review apps

Closes #6875

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

Revert "Merge branch 'ee-44998-split-admin-settings-into-multiple-sub-pages' into 'master'"

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

CE upstream - 2018-09-19 15:21 UTC

Closes gitlab-ce#48873

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

Fix rubocop Style/ZeroLengthPredicate

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

Relax the subject line requirements for commits

Closes gitlab-org/release/framework#16

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

Only verify the arguments we actually care about.

This reverts commit 8b046005

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

Port of force-post-migration-dir-schema-load to EE

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

# Conflicts:
#	config/initializers/0_post_deployment_migrations.rb
#	locale/gitlab.pot

[ci skip]

Re-enable legacy diff notes on merge request diffs

Closes #48873

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

Correct grammar (setup to set-up) in Docs (Port CE to EE)

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

Remove unused constant

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

CE upstream - 2018-09-19 12:23 UTC

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

EE Port: Split admin settings into subpages

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

(Squashed and merged via CLI)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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

This changes the hard limit of 50 to a soft limit of 50, with the new
hard limit being 72 characters. This gives people a bit more space,
while still (hopefully) guiding them towards subject lines that are
roughly 50 characters long.

Fixes https://gitlab.com/gitlab-org/release/framework/issues/16

Fix grammar in runner-related specs, views and localisations (Port CE to EE)

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

Fix grammar in runner-related specs, views and localisations.

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

This removes an unused constant from the
`RubyInterpolationInTranslation`. The constant was used in a first
implementation of this class.

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

Use standalone diff stats RPC on every comparison view

Closes #51477, #20282, and #49399

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

Include workhorse container in deploy.
DRY up use of helm command for reuse with print and execute.
Move automated cleanup job into a separate job and run it
in schedules only at the start of the pipeline.

Calculate cleanup thresholds once and use the following frequency:

Stop the envionments after 5 days.
Delete the envionment after 6 days.
Cleanup Helm installation after 7 days.

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

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

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

# Conflicts:
#	app/views/admin/users/index.html.haml
#	app/views/projects/mirrors/_mirror_repos.html.haml
#	app/views/projects/project_members/_new_project_member.html.haml

[ci skip]

Refactor main.js content

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

Unite green buttons under one css class

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

Unite green buttons under one css class (EE version)

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

Re-enables merge conflicts resolution spec

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

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