delta/gitlab/gitlab-ce.git/spec/models, branch gitlab-git-http-server

Merge branch 'hide-recent-push' into 'master'

2015-08-21T14:54:53+00:00

Only show recent push event if the branch still exists or a recent merge request has not been created

Closes #2277

See merge request !1167

Only show recent push event if the branch still exists or a recent merge request has not been created

2015-08-20T08:38:15+00:00

Closes #2277

Case-insensetive search for comments

2015-08-19T13:59:48+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'master' into remove-satellites

2015-08-17T09:41:53+00:00

Signed-off-by: Dmitriy Zaporozhets

Update Flowdock integration to support new Flowdock API

2015-08-14T14:45:23+00:00

Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.

Merge branch 'improve-hipchat-service-test' into 'master'

2015-08-13T11:43:44+00:00

Provide more feedback what went wrong if HipChat service failed test

This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks.

Screenshot:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/10f82eb02db138f9680e69cdb3d3ed82/image.png)

Issue gitlab-com/support-forum#213

See merge request !1144

Provide more feedback what went wrong if HipChat service failed test

2015-08-12T14:31:25+00:00

Issue gitlab-com/support-forum#213

Add merged label on branches page

2015-08-11T21:00:46+00:00

Revert "Merge branch 'revert-satellites' into 'master' "

2015-08-11T12:33:31+00:00

This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.

Revert "Merge branch 'refactor-can-be-merge' into 'master'"

2015-08-11T08:48:02+00:00

This reverts commit 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a, reversing
changes made to 804168e1def1204af712febb229f41a3865f085f.

Signed-off-by: Dmitriy Zaporozhets