Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

Change all in-product trial references from Premium/EE to Ultimate

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

# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/models/issue.rb
#	app/models/project.rb

[ci skip]

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

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

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

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

[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>

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

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

[ci skip]

[ci skip]

[ci skip]

Expose the target commit ID through the tag API

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

Use Goldiloader for handling N+1 queries

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

Use Goldiloader for handling N+1 queries

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

Bump Ruby to 2.3.7 and git to 2.17.0 in CI image

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

Resolve "Cannot read property 'commit_path' of null"

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

Resolve "Cannot read property 'commit_path' of null"

Closes #44296

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

Jira dev panel docs minor numbered list adjustment

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

Use gitlab-shell 7.1.2

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

Update GitLab SVGs version

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

# 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.

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.

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