Jan-Willem van der Meer 352ec75b7d Merge remote-tracking branch 'origin/master' into feature-admin-emails ...

Conflicts:
	db/schema.rb

2014-08-12 17:59:24 +02:00

..

assets

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

2014-07-21 16:34:27 +02:00

controllers

Move tests as well, remove public namespace from controller

2014-08-12 17:56:29 +02:00

finders

Fix project snippet comments loading

2014-07-02 19:53:41 +03:00

helpers

Make selectbox naming match issue #126

2014-08-11 13:38:11 +02:00

mailers

Move unsubscribes to root

2014-08-12 17:54:08 +02:00

models

Merge remote-tracking branch 'origin/master' into feature-admin-emails

2014-08-12 17:59:24 +02:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1

2014-07-16 12:39:45 +03:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge remote-tracking branch 'origin/master' into feature-admin-emails

2014-08-12 17:59:24 +02:00

workers

Enable unsubscribe for admin emails

2014-08-11 13:01:53 +02:00