delta/gitlab/gitlab-ce.git, branch downgrade-redis-3-2-2

Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq

2016-07-02T02:46:08+00:00

See:

https://github.com/mperham/sidekiq/blob/master/Changes.md#413
https://gitlab.com/gitlab-org/gitlab-ce/issues/19441

Merge branch 'upgrade-sidekiq' into 'master'

2016-07-01T20:55:13+00:00


Upgrade Sidekiq from 4.1.2 to 4.1.4.

Adds a dependency on Sinatra and allows Sinatra 2 for eventual support of Rack 2.

Changelog: https://github.com/mperham/sidekiq/blob/master/Changes.md#414

Working toward #14286. 

See merge request !5044

Merge branch 'upgrade-seedfu' into 'master'

2016-07-01T20:53:06+00:00


Upgrade seed-fu from 2.3.5 to 2.3.6

Adds Rails 5 support. Working toward #14286.

Changelog: https://github.com/mbleigh/seed-fu/blob/master/CHANGELOG.md#version-236

See merge request !5042

Merge branch 'upgrade-sass-rails' into 'master'

2016-07-01T20:52:10+00:00


Upgrade sass-rails

## What does this MR do?

Upgrades sass-rails from 5.0.4 to 5.0.5. Includes support for Rails 5.

Changelog: https://github.com/rails/sass-rails/releases

Working toward #14286 

See merge request !5030

Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master'

2016-07-01T20:27:26+00:00


Enable Style/EmptyLines Rubocop cop

#17478

See merge request !5013

Merge branch 'renable-import-button-when-namespace-already-been-taken' into 'master'

2016-07-01T20:09:27+00:00


Renable import button when import process fail due to the namespace already been taken

Closes #19435 

## Screenshots (if relevant)

Before:

![1](/uploads/e8de1b326e0751891f667630a7685f6a/1.png)



After:

![2](/uploads/566f1fd5442c28232350689fce8eae76/2.png)

See merge request !5053

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01T19:56:17+00:00

Update CHANGELOG

2016-07-01T19:43:11+00:00

Cache results from jQuery selectors to retrieve namespace name

2016-07-01T19:43:11+00:00

Fix import button when import fail due the namespace already been taken

2016-07-01T19:04:24+00:00