CE upstream - 2018-10-17 22:21 UTC

Closes gitlab-qa#233

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

Trim database changes MR template and require up-to-date description before sending an MR for review

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

[QA] Fix the 'clone using deploy key' tests

Closes gitlab-org/quality/nightly#26

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

Audit log: Add logging for project feature changes

Closes #8027

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

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

QA: Set sandbox group visibility to public

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

QA: Add support for pushing and viewing files

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

change generating url functions for external url

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

When to create follow-up technical debt issues

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

Fix Groups::UpdateService#execute not returning correct error code

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

This also adds audit events for repository size limits and the Maven
package setting.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8027

Make getting a user by the username case insensitive

Closes #27229 and #38304

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

This was causing problems in EE, where audit events were being
generated even if the project failed to save.

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

Fixes broken borders in reports section MR widget

Closes #51386

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

Reduces CE to EE code differences

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

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

[ci skip] Update Gitaly installation documentation

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

Strip whitespace around GitHub personal access tokens

Closes #46588

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

Document the role of the maintainer

Closes #52114

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

Resolve "Broken master: jasmine/new-line-before-expect in eslint"

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

Resolve "Broken master: jasmine/new-line-before-expect in eslint"

Closes #52838

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

Prettify all the karma specs

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

# Conflicts:
#	CHANGELOG.md
#	Gemfile.lock
#	Gemfile.rails5.lock
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/store/getters.js
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	locale/gitlab.pot
#	qa/qa/page/project/menu.rb
#	spec/javascripts/pipelines/graph/stage_column_component_spec.js

[ci skip]

# Conflicts:
#   spec/javascripts/clusters/components/application_row_spec.js

Merge branch '7493-configuring-prometheus-alerts-causes-cluster-install-page-to-display-error-message' into 'master'

Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message"

Closes #7493

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

Merge branch '7493-configuring-prometheus-alerts-causes-cluster-install-page-to-display-error-message' into 'master'

Backport: Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message"

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

CE upstream - 2018-10-17 09:21 UTC

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

[ci skip] Fix documentation of Gitlab::Git::Diff#filter_diff_options flags

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