Jacob Vosmaer 5629546794 Merge remote-tracking branch 'origin/master' into ldap/cache_check ...

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb

2014-08-06 18:09:07 +02:00

..

assets

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

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

controllers

Merge remote-tracking branch 'origin/master' into ldap/cache_check

2014-08-06 18:09:07 +02:00

finders

Fix project snippet comments loading

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

helpers

Force encoding to utf8. ruby 1.9 fix

2014-07-23 12:32:19 +03:00

mailers

Merge branch 'improve-email-threading' into 'master'

2014-07-07 14:06:40 +00:00

models

Merge remote-tracking branch 'origin/master' into ldap/cache_check

2014-08-06 18:09:07 +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 branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1

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

workers

Added update repository size to repository import

2014-06-11 19:32:00 +00:00