Condense commits already in target branch when updating merge request source branch.

Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043.

![Screen_Shot_2015-03-06_at_17.17.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/8d03540b7b7294ce07005e6f3db6ed3d/Screen_Shot_2015-03-06_at_17.17.13.png)

(Not shown in screenshot, but works fine with rebases as well)

See merge request !1648

Use bootstrap buttons with custom colors instead of own css

Reduce amount of custom css will make UI development easier

See merge request !1641

Add notes notifications to services

This merge request builds on top of a few other merge requests:

* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/350

The purpose of this merge request is to add service notification support when a user comments on one of the following:

* commits
* issues
* merge requests
* code snippets

Currently HipChat and Slack are only supported. The admin can select which events to toggle on or off.

## Questions

All note events are bundled under the `note` event type. Is this okay, or does it make more sense to have individual events and/or change the `object_type` attribute in the hook data?

Also, does it look better to link the entire `merge request #X` as opposed to just `#X`? I like the former.

## Before

![Screen Shot 2015-03-01 at 3.05.56 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/8ae828e652/Screen_Shot_2015-03-01_at_3.05.56_PM.png)

## After

![Screen Shot 2015-03-06 at 6.24.40 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/7b866ae02b/Screen_Shot_2015-03-06_at_6.24.40_AM.png)

### Slack

![Screen Shot 2015-03-01 at 2.59.00 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/0147c2dc38/Screen_Shot_2015-03-01_at_2.59.00_PM.png)

### HipChat

![Screen Shot 2015-03-01 at 2.59.19 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/14e78fc61c/Screen_Shot_2015-03-01_at_2.59.19_PM.png)

See merge request !358

Supports four different event types all bundled under the "note" event type:

- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet

Bump gitlab_git to fix 500 with annotated tags w/o message

Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181

See merge request !1640

Cache project row on dashboard, group and user page

See merge request !1639

Update gemnasium-gitlab-service gem

Add merge and issue event notification for HipChat

This adds merge and issue event notification for HipChat. This depends on the MR used for Slack:

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237

This should also address #1085.

Before:

![Screen Shot 2015-02-23 at 8.55.08 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/6123e3251b/Screen_Shot_2015-02-23_at_8.55.08_AM.png)

After:

![Screen Shot 2015-02-23 at 8.54.22 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/19eabc8bf6/Screen_Shot_2015-02-23_at_8.54.22_AM.png)

![Screen Shot 2015-02-23 at 9.25.51 PM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/0ea6229ddc/Screen_Shot_2015-02-23_at_9.25.51_PM.png)

See merge request !350

Fix checkbox alignment in application settings

Add the form-control CSS class to the feature checkboxes on the application settings page to fix the vertical alignment with their labels.  See #2053.

Also add aria-describedby attributes to form controls that have a help text block (http://getbootstrap.com/css/#callout-help-text-accessibility).

## Before

![Admin_area___GitLab](https://dev.gitlab.org/Okada/gitlabhq/uploads/2736fe81ba564b43cbef37cd187cf47a/Admin_area___GitLab.png)

---

## After

![Admin_area___GitLab_-_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/95a8a26600458c9c55bc05d2e0c6be47/Admin_area___GitLab_-_after.png)

---

This doesn't address the help text block for the twitter checkbox.  @dzaporozhets Do you want to keep the help text visible or would you rather put it in a dialog and hide it initially?

cc @sytse

See merge request !1615

Update rugments, fixes #8900

Improve projects list

* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button

For #2069

See merge request !1636

Increase timeout for Git-over-HTTP requests.

Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232.

Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty.

The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`.

See merge request !1619

* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button

Update spring to 1.3.3

See merge request !1635

Re-annotate models

See merge request !1634

Add more Slack notifications for issue and merge request events

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 by Stan Hu.

See merge request !1556

Web Hook sends email of pusher

See merge request !1630

Add Service Templates to CHANGELOG

See merge request !1633

Advise on how to help others.

See merge request !1632

Bump gitlab_git to rc15

For #2033

See merge request !1631