7-4-stable to master

See merge request !1191

Merge master into 7-4-stable

See merge request !1189

Fix user being blocked after oauth sign-in

See merge request !1190

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

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

Issue respect single sign on

Adds regression test for #1677

See merge request !1188

verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models

This is handled within the LDAP class

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

Add a few items to changelog

See merge request !1187

Issue respect single sign on

Fixes #1677 by making sure the per-build user is saved as well. Otherwise the user is passed to devise, and the user is saved afterwards, creating a successful signup.

See merge request !1186

Because devise will trigger a save, allowing unsaved users to login, behaviour had changed.
The current implementation returns a pre-build user, which can be saved without errors.

Reported in #1677

Fix link to githost.io

Documentation pointed to wrong gitlab-ci project.

See merge request !222

Note omnibus in installation

See merge request !1184

Improve locked merge request UI

It allows us easily detect when MR get into lock state

Fixes UI part of #1674

See merge request !1183

No red builds policy

Related to gitlab/organization#63

See merge request !1182

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

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

Conflicts:
	doc/workflow/README.md

same rendering for note diff as for usual diff

Changelog: added information about sorting users

See merge request !1175

Notifications documentation

Fixes #1583

See merge request !1177

Fix star icon

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/682.

See merge request !1180

Improve MR widgets

Before:

![Screenshot 2014-10-14 17.49.03](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/0283aa379e/Screenshot_2014-10-14_17.49.03.png)

After:

![Screenshot 2014-10-14 17.48.58](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/ca9f2bae19/Screenshot_2014-10-14_17.48.58.png)

See merge request !1178

Issue ldap initialization

If LDAP is disabled error will appear:

```
ERROR -- : Missing setting 'servers' in 'ldap' section in /Volumes/Work/gitlab/development/community/gitlab/config/gitlab.yml (Settingslogic::MissingSetting)
```

@marin Can you test if this will solve the startup problem?

See merge request !1179