delta/gitlab/gitlab-ce.git/app/controllers/projects, branch enable_ssl_verification_web_hook

Enable SSL verification for Webhooks

2015-08-26T12:48:31+00:00

Fix blame view line groupings

2015-08-20T08:27:29+00:00

Closes #2305

Merge branch 'master' into remove-satellites

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

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'

2015-08-14T11:01:43+00:00

Disable internal issue tracker if external tracker in use

### What does this MR do?

This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes.

### Why was this MR needed?

Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them.

### What are the relevant issue numbers?

Closes #2006

See merge request !993

Provide more feedback what went wrong if HipChat service failed test

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

Issue gitlab-com/support-forum#213

Merge branch 'master' into remove-satellites

2015-08-11T20:48:55+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'grit_blame' into 'master'

2015-08-11T14:45:54+00:00


Fast blame

Improve performance for file blame page. Also bring some small UI improvements

See merge request !1129

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

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

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

Revert "Refactor web editor"

2015-08-11T09:49:09+00:00

This reverts commit dfccb06dda344819989fa8d6a9a3c56c5ca0b65f.

Signed-off-by: Dmitriy Zaporozhets

Revert "Merge branch 'drop-satellites'"

2015-08-11T08:28:42+00:00

This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.

Signed-off-by: Dmitriy Zaporozhets