Bump Ruby to 2.3.7 and git to 2.17.0 in CI image

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

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

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

Move BoardBlankState vue component

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

# 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

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

# Conflicts:
#	app/views/layouts/nav/sidebar/_project.html.haml
#	app/views/projects/_home_panel.html.haml

[ci skip]

Add user documentation for badges

Closes #41174 and #41176

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

Projects and groups badges settings UI (EE-port)

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

Projects and groups badges settings UI

Closes #41174 and #41176

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

An untested code path was triggering an Exception because Fixnum
doesn't have `one?` implemented in Rails, while arrays and collections
do.

Closes #45152

In Rails 5.0 `assert_template` and `assigns()` have been extracted to
the `rails-controller-testing` gem.
https://github.com/rails/rails/pull/20138/files

This commit adds this gem for rails5.

In Rails 5.0 the `ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES`
constant has been removed [1] and the remaining `FALSE_VALUES` constant
has been moved to `ActiveModel::Type::Boolean` [2]

[1]: https://github.com/rails/rails/commit/a502703c3d2151d4d3b421b29fefdac5ad05df61
[2]: https://github.com/rails/rails/commit/9cc8c6f3730df3d94c81a55be9ee1b7b4ffd29f6

CE upstream - 2018-04-07 09:18 UTC

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

Branch Unprotection Restrictions using group/user access levels

Closes #4800

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

# Conflicts:
#	app/views/projects/settings/repository/show.html.haml
#	config/routes/project.rb
#	doc/user/project/index.md

[ci skip]