Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Upstream changes from CE

See merge request !262

Tips for updating CE to EE with RPMs

I got an annoying error today while trying to upgrade CE to EE on Centos.

See merge request !259

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Patch release packages 7.5.3

See merge request !263

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb

Fix Redis::InheritedError

This was hand-tested against 7.5.2-ee.

A proper solution would be to update Sidetiq to 0.6.3 or newer but
that requires first upgrading Sidekiq to 3.x.

See merge request !260

Rake task for google email schema verfication

#1607

See merge request !1300

Dev rake task docs

As discussed in #1184

See merge request !1301

Refactor atom code

See merge request !1304

Atom feed for user

This feature allows to subscribe for users activity via atom feed.

See merge request !1303

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Sidekiq 2.17.8

See merge request !1277

Prevent 500 test webhook

Fixes #1803

See merge request !1299

Supporting for multiple omniauth provider for the same user

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721

and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760

See merge request !1296

Write to log if web hook cant be executed. This prevents 500 error when
test web hook with invalid URL and prevent exceptions and retries in
sidekiq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Improve english wording in UI filters

Fixes #1664

See merge request !1298

Docker version upgrades

See merge request !251

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Update Docker configuration to 7.5.2 + minor improvements

- Update to 7.5.2
- logs are now readable with `docker logs`
- recommend an interactive command line for configuration

See merge request !250