# Conflicts:
#	app/controllers/projects/wikis_controller.rb
#	app/models/ci/job_artifact.rb
#	app/models/issue.rb
#	app/models/project.rb
#	app/models/project_statistics.rb
#	spec/models/ci/build_spec.rb

[ci skip]

CE upstream - 2018-04-18 15:24 UTC

Closes gitaly#1115

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

Fix N+1 queries when loading participants for a commit note

Closes #45526

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

[Rails5] Fix `User#manageable_groups`

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

Fix typo in vue.md

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

Fixed IDE diff markers being cached too long

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

EE: Fix direct_upload when records with null file_store are used

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

Fix Epic timeline bar misalignment when start date is in last timeframe month and end date is out of range

Closes #5658

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

Added staged files state to IDE

Closes #44842, #44844, and gitlab-ee#4541

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

Fix direct_upload for old records

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

Old records have a null value of file_store column.
This causes the problems with current direct_upload implementation,
as this makes it to choose Store::REMOTE instead of Store::LOCAL.

This change moves the store save when change saving the object.

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

Old records have a null value of file_store column.
This causes the problems with current direct_upload implementation,
as this makes it to choose Store::REMOTE instead of Store::LOCAL.

This change moves the store save when change saving the object.

Geo: Add back job artifacts sync status to /admin/geo_nodes

Closes #5712

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

Upgrading gitlab-gollum-lib and rouge

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

Resolve "Calculating total size of a project's CI artifacts"

Closes #41059

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

[Rails5] Avoid type casting in uniqueness validator

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

Previously we scheduled a worker to just some this but we were running
into performance issues when the build table was getting too large. So
now we've updated the code such that this column is updated immediately
and incremented/decremented by the correct amount whenever artifacts are
created or deleted.

We've also added the performance optimization that we do not update this
statistic if a project is deleted because it could result in many
updates for a project with many builds.

Ee 41059 calculate artifact size more efficiently

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

Fix label links update on project transfer

Closes #44158

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

Resolve "Get rid of branch element all in bottom bar in WEB IDE"

Closes #44834

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

Previously we scheduled a worker to just some this but we were running
into performance issues when the build table was getting too large. So
now we've updated the code such that this column is updated immediately
and incremented/decremented by the correct amount whenever artifacts are
created or deleted.

We've also added the performance optimization that we do not update this
statistic if a project is deleted because it could result in many
updates for a project with many builds.

Resolve "Show `failure_reason` in jobs view content section"

Closes #44271

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

Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#features (#5320)

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

Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#features (#5320)

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

We saw about 10,000 SQL queries for some commits in the NewNoteWorker,
which stalled the Sidekiq queue for other new notes. The notification
service took up to 8 minutes to process the commits. Avoiding this
N+1 query brings the time down significantly.

Closes #45526

In `arel 7.0` (`7.1.4` version is used for rails5) there were introduced
some changes that break our code in the `User#manageable_groups` method.

The problem is that `arel_table[:id].in(Arel::Nodes::SqlLiteral)` generates
wrong `IN ()` construction. The selection for `IN` is missing:

=> "\"namespaces\".\"id\" IN (0)"

That caused such spec errors for the `rails5` branch:

```
4) User groups with child groups #manageable_groups does not include duplicates if a membership was added for the subgroup
    Failure/Error: expect(user.manageable_groups).to contain_exactly(group, subgroup)

      expected collection contained:  [#<Group id:232 @group29>, #<Group id:234 @group29/group30>]
      actual collection contained:    []
      the missing elements were:      [#<Group id:232 @group29>, #<Group id:234 @group29/group30>]
    # ./spec/models/user_spec.rb:699:in `block (5 levels) in <top (required)>'
    # ./spec/spec_helper.rb:188:in `block (2 levels) in <top (required)>'
    # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec/retry.rb:112:in `block in run'
    # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec/retry.rb:101:in `loop'
    # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec/retry.rb:101:in `run'
    # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec_ext/rspec_ext.rb:12:in `run_with_retry'
    # /var/lib/gems/2.3.0/gems/rspec-retry-0.4.6/lib/rspec/retry.rb:30:in `block (2 levels) in setup'
```

This commit changes `User#manageable_groups` in the way to drop the usage of
`Arel::Nodes::SqlLiteral` and adds usage of raw SQL query.
This change should be updated when we're migrated to Rails 5.2 because arel
was fixed in `9.0.0` (which is used in Rails 5.2).

This commit does two things:
1. Synchronizes `Gemfile.rails5.lock` with the latest changes in `Gemfile`
2. Adds a monkey patch for active record to avoid type casting in uniqueness
validator.

In Rails 5.0 there was introduced a bug [1] that causes to problems like
this:

```
1) API::Users POST /user/:id/gpg_keys/:key_id/revoke when authenticated revokes existing key
Failure/Error: let(:gpg_key) { create(:gpg_key, user: user) }
TypeError:
  can't cast Hash
```

This bug was fixed in Rails 5.1 [2].

[1]: https://github.com/rails/rails/pull/23523/commits/811a4fa8eb6ceea841e61e8ac05747ffb69595ae
[2]: https://github.com/rails/rails/pull/24745/commits/aa062318c451512035c10898a1af95943b1a3803