* '9-1-ce-upstream' of https://gitlab.com/gitlab-org/gitlab-ee:
  Fix spinach specs
  Fix spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb

Fix bad resolved conflict for app/assets/javascripts/environments/folder/environments_folder_view.js

https://gitlab.com/gitlab-org/gitlab-ee/commit/df6aada2ce096ed3173a54a2da918c143611e023

* 9-1-stable: (509 commits)
  Periodically clean up temporary upload files to recover storage space
  Add a name field to the group edit form
  Remove the User#is_admin? method
  Fix specs
  Enable RSpec/DescribeSymbol; update .rubocop_todo.yml
  Update rubocop-rspec 1.12.0 -> 1.15.0
  Rename displaying_blame to blame
  Actually include WaitForAjax!
  Don't show Copy contents button on Blame page
  alfredo review changes
  Give explicit height to SVG icons for Safari
  Update MR title change icon
  Put back usernames in activity and profile feed
  Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run
  Revert yarn.lock changes
  add CHANGELOG.md entry for !10522
  upgrade webpack-dev-server to fix issues with SockJS causing odd reload behavior in firefox
  upgrade webpack to v2.3.3 to resolve sourcemap issues
  Rever yarn.lock changes
  Revert yarn.lock file changes
  ...

Clean carrierwave tempfiles

Closes #28540

See merge request !9466

[EE] Remove the User#is_admin? method

See merge request !1615

Refactor javascript behaviors directory

See merge request !10439

Remove the `User#is_admin?` method

Closes #30584

See merge request !10520

Add a name field to the group edit form

See merge request !10502

Enables user specification of group name vs. name inferred from group path.

Cause new group form to copy name from path

Adds some new page-specific javascript that copies entry from the
group path field to the group name field when the group name field
is initially empty.

Remove duplicate group name entry field on group edit form

This corrects the duplicated name entry field and tests that the
JavaScript does not update the group name field if the user
edits the group path.  (Editing the group path is not recommended
in any case, but it is possible.)

Address eslint errors in group.js

Enable group name copy with dispatch and explore group creation

The dispatch and explore group creation forms require the group.js
asset, and their tests now require testing against poltergeist

Update workflow new group instruction

Update the gitlab basics group creation document

Add a change log entry

Remove unused variable for eslint

Update rubocop-rspec 1.12.0 -> 1.15.0

See merge request !1609

Add option to start a new resolvable discussion in an MR

Closes #24378

See merge request !7527

EE port of "Start discussion"

See merge request !1556

Update droplab to webpack version ee

See merge request !1608

Update rubocop-rspec 1.12.0 -> 1.15.0

See merge request !10561

Port of button-capitalisation for EE

See merge request !1590

Don't show Copy contents button on Blame page

See merge request !10560