CE upstream - 2018-07-20 05:29 UTC

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

Moves CSS of security reports into CE folder

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

CE upstream - 2018-07-19 15:22 UTC

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

Resolve "Geo: Unable to disable verification on the secondary"

Closes #6964

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

Add additional logging for Geo Log Cursor

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

Backport of gitlab-org/gitlab-ee!6137

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

Add missing Gitaly branch_update nil checks

Closes #49263

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

Move a first batch of EE-specific JS specs to ee/spec/javascripts

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

1. Log the batch of IDs taken
2. Log when a gap in the event sequence is detected

Add a Gitlab::Profiler.print_by_total_time convenience method

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

Allow testAction to work for async actions that don't return a Promise

Closes #49413

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

This method uses Gitlab::Profiler::TotalTimeFlatPrinter internally, which is the
same as RubyProf::FlatPrinter, but the min_percent option (and new max_percent
option) applies to the _total_ time, not the _self_ time. This helps us figure
out if we're calling a library inefficiently, for instance.

Enable more frozen string in app/services/**/*.rb

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

Rails 5 fix NoMethodError: undefined method 'message' for nil:NilClass in host_spec.rb

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

CE upstream - 2018-07-19 12:22 UTC

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

Rails5 fix no implicit conversion of Symbol into Integer

Closes #6930

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

# Conflicts:
#	config/initializers/1_settings.rb
#	config/sidekiq_queues.yml

[ci skip]

Remove duplicated include IgnorableColumn in user model

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

Escape username and password in UrlSanitizer#full_url

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

Resolve "Clean up after RemoveCommaFromWeightSystemNotes migration"

Closes #6793

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

CE upstream - 2018-07-19 09:25 UTC

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

Use rugged to validate ref name

Closes #49043

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

Rails5 fix user sees revert modal spec

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

Delete UserActivities and related workers

Closes #43312

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

Delete UserActivities and related workers

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

Add button to regenerate 2FA codes.

Closes #48408

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

If a user uses a password with certain characters (e.g. /, #, +, etc.)
UrlSanitizer#full_url will generate an invalid URL that cannot be
parsed properly by Addressable::URI. If used with UrlBlocker, this
will be flagged as an invalid URI.