# Conflicts:
#   db/schema.rb

Replace vue resource with axios for pipelines table

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

Document process for new Git features

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

Use Gitaly 0.95.0

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

Verify that deploy token has valid access when pulling container registry image

Closes #45148

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

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

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

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

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

[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

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"

Closes #44296

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

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

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.

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

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

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.

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

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

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