James Lopez 7614d230a2 fix conflicts

2016-04-21 17:28:56 +02:00

..

assets

Revert "Merge branch 'sentry-js' into 'master' "

2016-04-21 07:27:27 -04:00

controllers

Merge branch 'issue_5838' into 'master'

2016-04-21 10:31:20 +00:00

finders

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters

2016-04-21 08:37:38 +02:00

helpers

Merge branch 'top-navigation-concept' into 'master'

2016-04-21 11:48:28 +00:00

mailers

Merge branch 'mr-formatting' into 'master'

2016-04-19 16:23:41 +00:00

models

fix conflicts

2016-04-21 17:28:56 +02:00

services

fix conflicts

2016-04-21 17:28:56 +02:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

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

views

Merge branch 'top-navigation-concept' into 'master'

2016-04-21 11:48:28 +00:00

workers

Merge branch 'feature/system_hook_push' into 'master'

2016-04-19 09:34:47 +00:00