Douwe Maan ca8a44be82 Merge branch 'issue_13716' into 'master' ...

Check for conflicts before creating new revert branch

Fixes #13716 

See merge request !2953

2016-03-02 10:51:43 +00:00

..

assets

Merge branch 'shortcuts-help' into 'master'

2016-03-02 09:13:19 +00:00

controllers

Merge branch 'logged-out-search' into 'master'

2016-03-01 19:57:10 +00:00

finders

Rename Tasks to Todos

2016-02-20 12:39:27 -02:00

helpers

Merge branch 'mr-prefix-activity-view' into 'master'

2016-03-01 14:02:43 +00:00

mailers

Fix broken link in CI build notification emails

2016-02-12 14:01:27 +01:00

models

Add some specs for Repository#revert.

2016-03-01 19:16:27 -05:00

services

Check for conflicts before creating target branch.

2016-03-01 19:16:27 -05:00

uploaders

Minor changes on avatar cropping internals

2016-02-18 13:12:39 +01:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Merge branch 'logged-out-search' into 'master'

2016-03-01 19:57:10 +00:00

workers

Moved cache expiration code to Repository hooks

2016-02-23 12:02:59 +01:00