[ci skip]

[ci skip]

Add MockCiService integration

See merge request !1310

Remove repository_storage from V4 "/application/settings" settings API

Closes #1790

See merge request !1307

Add repository storage field back to projects API

See merge request !1300

Fixed failing tests with ajax spinner

See merge request !1317

# Conflicts:
#   doc/api/v3_to_v4.md

API: Return 400 for all validation erros in the mebers API

See merge request !1311

Port of "remove-require-context-application-bundle" to EE

See merge request !1298

Deploy boards

Closes #1589

See merge request !1233

MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9250/

See https://gitlab.com/madlittlemods/gl-mock-ci-service

Conflicts:
	lib/api/services.rb

Port of dm-fix-web-edit-new-lines to EE

See merge request !1248

remove Turbolinks from lockfile.js, do page refresh instead

See merge request !1299

Enable the RSpec/BeEql cop

See merge request !1295

This was an admin-only field that was exposed, and there were no tests
for doing this as an admin and getting that response. In CE, we renamed
the `user` option to `current_user`, and inadvertently broke this.

Deleting a user shouldn't delete associated issues.

See merge request !862

* master:
  Remove ProjectGitHook API
  Document how to use filter-branch to reduce the repo file size

Remove ProjectGitHook API

Closes #1791

See merge request !1301

Document how to use filter-branch to reduce the repo file size

Closes #1270

See merge request !914

[ci skip]

* master: (467 commits)
  Fix the filtered search
  Resolve merge conflicts
  Fit GitAccess specs
  Fix new offenses
  Fix new offenses
  Stylistic tweaks
  Remove stray conflict
  Fix OAuth/SAML user blocking behavior
  Revert "Enable Style/DotPosition"
  Revert "Prefer leading style for Style/DotPosition"
  Revert "Enable Style/BarePercentLiterals"
  Manually correct autocorrect
  Move up delegate calls
  Exclude migrations from Style/MutableConstant
  ActiveSupport delegation is preferred over Forwardable
  Update haml_lint to work with newest rubocop
  Fix incorrect rubocop autocorrects
  Regenerate .rubocop_todo.yml for EE
  Fix EE offenses
  Add explanations to cops
  ...