Yorick Peterse a07be7bcf5 Removed merge conflicts in the User model

2015-11-20 15:40:17 +01:00

..

assets

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

controllers

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

finders

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

helpers

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

mailers

Merge remote-tracking branch 'origin/master' into ce_upstream

2015-10-23 13:01:19 +02:00

models

Removed merge conflicts in the User model

2015-11-20 15:40:17 +01:00

services

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

uploaders

Merge branch 'refactor-duplication' into 'master'

2015-11-16 13:05:49 +00:00

views

Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee

2015-11-20 14:05:09 +01:00

workers

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00