CE upstream - 2018-04-11 15:29 UTC

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

Merge branch '5576-geo-checksum-failures-often-due-to-repository-not-existing-on-disk' into 'master'

Resolve "Geo: Checksum failures often due to repository not existing on disk"

Closes #5576

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

Geo: Propagate broadcast messages to secondaries

Closes #4930

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

Shorten protected branch / tag access level dropdown text

Closes #5216

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

Resolve "Geo: Wiki repository verification is broken"

Closes #5619

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

Geo: Minor improvements to Disaster Recovery and Planned Failover docs

Closes #4932

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

[Rails5] Update Event#subclass_from_attributes method

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

Link Monitor docs to the front page

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

Link Monitor docs to the front page

Closes #45006

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

CE upstream - 2018-04-11 12:26 UTC

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

Resolve "tree/master shows incorrect CI build status"

Closes #44541

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

Replace vue resource with axios for pipeline details page

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

Issue export CSV includes "Weight" and "Locked"

Closes #2172 and #2287

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

Client implementation for InfoAttributes

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

Resolve "Illustration for the case where the job has finished and the log was erased"

Closes #45159

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

# Conflicts:
#	lib/rspec_flaky/flaky_examples_collection.rb

[ci skip]

Clients can now request the attributes from `$GIT_DIR/info/attributes`
through Gitaly. The Gitaly migration is described in gitlab-org/gitaly#1082.

The parser algorithm was implemented in a way it could handle both file
contents or a File handle, and both were already tested.

Other than that, using the boy scout rule, I've removed a class,
InfoAttributes, as it was delegating everything to the parser and
therefor wasn't really needed in my opinion.

Resolve "Clean outdated flaky specs from the flaky specs report"

Closes #37721

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

[EE] Resolve "Clean outdated flaky specs from the flaky specs report"

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

Replace the `project/issues/milestones.feature` spinach test with an rspec analog

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

Replace the `project/commits/branches.feature` spinach test with an rspec analog

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

Resolve "When editing a comment in an issue, the preview mode is toggled in the main textarea"

Closes #44697

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

In Rails 5.0 the `ActiveRecord::Inheritance::subclass_from_attributes`
method was updated.
Now it calls the `find_sti_class` method [1] which is overriden in the `Event`
model and returns needed class (`Event` vs `PushEvent`).

[1]: https://github.com/rails/rails/blob/5-0-stable/activerecord/lib/active_record/inheritance.rb#L209

This commit fixes the errors like
```
143) User#contributed_projects doesn't include IDs for unrelated projects
      Failure/Error: action = attrs.with_indifferent_access[inheritance_column].to_i

      NoMethodError:
        undefined method `with_indifferent_access' for nil:NilClass
      # ./app/models/event.rb:118:in `subclass_from_attributes'
```
which are raised on the `RAILS5=1 rspec ...` command.

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

Closes #5444

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