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

..

controllers

Add tests for redirects.

2014-07-08 20:25:25 +02:00

factories

Use last appearance settings. Show last edit date

2014-04-14 22:14:51 +03:00

features

Remove rails observers from application

2014-06-17 22:51:43 +03:00

finders

Serialize last_fetched_at as a string with seconds

2014-04-28 12:42:01 +02:00

fixtures

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

helpers

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

2014-06-26 13:02:08 +03:00

javascripts

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

lib

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

2014-07-10 23:43:42 +03:00

mailers

Allow more mail clients to group emails by thread

2014-07-03 16:58:42 +02:00

models

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

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

requests/api

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

2014-07-10 23:43:42 +03:00

routing

Delete wall notes tests

2014-06-13 14:29:26 +03:00

services

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

2014-07-10 23:43:42 +03:00

support

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2014-06-30 20:06:23 +03:00

tasks/gitlab

Make backup version blocker test more robust

2014-02-28 12:11:43 +01:00

workers

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

factories_spec.rb

Style changes from review with @randx

2013-07-17 22:48:03 -04:00

factories.rb

Enable snippets by default in project factory

2014-06-30 14:02:52 +03:00

seed_project.tar.gz

Speed up features/notes_on_merge_requests_spec

2014-03-19 03:57:37 -04:00

spec_helper.rb

Remove rails observers from application

2014-06-17 22:51:43 +03:00