Dmitriy Zaporozhets 31af3f4003 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	spec/models/note_spec.rb

2015-03-19 23:21:50 -07:00

..

assets

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00

controllers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00

finders

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-02 16:10:12 -08:00

helpers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00

mailers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-16 21:25:00 -07:00

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00

workers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-19 23:21:50 -07:00