[ci skip]

Prevent LDAP from downgrading a group\'s last owner. Fixes #325

This should fix #325. I based it on the logic in !215 but optimized it a bit. I also added a new test and fixed an existing one that was prone to false-negatives. 

See merge request !216

Update gitlab-elastic-search gem



See merge request !234

Correct API documentation for Project Git Hooks endpoint

This documentation update is meant to mirror the change that occurred in b85b1f26 and 2ff68bfc. These changes use the singular form of `Git Hook`.

Fixes: #38

See merge request !168

ES subprocess

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/296

See merge request !232

[ci skip]

Add migration to rename column light_logo -> header_logo

Also removes dark_logo which was unused

See merge request !233

Also removes dark_logo which was unused

CE upstream



See merge request !231

Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014

Refactoring around appearance

This was cherry picked instead of manual copy-pasting.

See merge request !230

Precompile assets before all spinach tests

Try to fix failing tests.

cc @jschatz1 

See merge request !3041

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

The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it

Changed # to ! on merge requests on activity view

Closes #9082

![Screen_Shot_2016-02-23_at_11.59.55](/uploads/87b859ae63282ae24025168404beb158/Screen_Shot_2016-02-23_at_11.59.55.png)

See merge request !2938

Batch size >1000 does not pay off

We did a small experiment to see how a full scan of the Redis keys on
gitlab.com speeds up as we increase the batch size. The values on the
right are time in seconds for a full scan (no delete operations).

```
count: 10);      284.500529021
count: 100);      86.21216934
count: 1_000);    60.931676195
count: 10_000);   60.96355610
count: 100_000);  62.378172541
```

It looks like 1,000 is a good number.

See merge request !2970

Explain why we mangle blob content types

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079

See merge request !2956

Closes #9082

Update Rails to 4.2.5.2

See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ
and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ

See merge request !3019

Brings back missing "Gitlab" text on the logo

Closes #13851 

See merge request !2989