CE upstream - 2018-04-09 12:27 UTC

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

[EE] Migrate features/project/project.feature to RSpec and reorganize several Project feature specs

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

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

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

[ci skip]

[ci skip]

Use Goldiloader for handling N+1 queries

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

Resolve "Cannot read property 'commit_path' of null"

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

Jira dev panel docs minor numbered list adjustment

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

# Conflicts:
#	app/assets/javascripts/boards/components/board.js

[ci skip]

Goldiloader is great, but has several issues with has_many :through relations:

* https://github.com/salsify/goldiloader/issues/12
* https://github.com/salsify/goldiloader/issues/14
* https://github.com/salsify/goldiloader/issues/18

Rather than try to figure out which applies in each case, we should just do the
drudge work of manually disabling autoloading for all relations of this type. We
can always use regular preloading for specific cases, but this way we avoid
generating invalid queries through Goldiloader's magic.

Goldiloader (https://github.com/salsify/goldiloader) can eager load
associations automatically. This removes the need for adding "includes"
calls in a variety of different places. This also comes with the added
benefit of not having to eager load data if it's not used.

CE upstream - 2018-04-09 09:27 UTC

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

[Rails5] Fix `can't modify frozen Array` errors

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

Resolve "Group owner cannot enable/disable specific-runners which was registered in a project under a subgroup"

Closes #41981

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

Move BoardBlankState vue component

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

Move BoardBlankState vue component

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

Make email handler clearer

Closes #37403

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

Move FindLicense RPC to OPT OUT status

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

# Conflicts:
#	app/assets/javascripts/boards/index.js

[ci skip]

[Rails5] Add `rails-controller-testing` gem

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

Fix undefined method `one?` when pushing to an existing merge request

Closes #45152

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

Remove modal store and mixins from global scope

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

Remove modal boards code from global namepsace

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

[Rails5] Add FALSE_VALUES constant to Service#boolean_accessor

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

Resolve "Template selectors menu title mistakenly shown after toggling previewed changes"

Closes #32617

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

Handle legacy repository archive requests with no ref given

Closes #45154

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

Use project_authorizations instead of members to calculate manageable CI projects to speed up query (#41981)

CE upstream - 2018-04-08 12:23 UTC

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

The legacy endpoint requires no reference and defaults to the root
ref.

Closes #45154