Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups ...

Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb

2014-08-29 14:43:20 +02:00

..

controllers

Fix unsubscribe controller spec.

2014-08-22 12:03:33 +02:00

factories

Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02:00

features

Fix tests

2014-08-07 20:46:17 +03:00

finders

Typo fix.

2014-08-20 08:35:18 +02:00

fixtures

Add trailing newline to all text files.

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

helpers

Merge branch 'merge_ce_27cf081e1b0b1df166' into 'master'

2014-08-18 10:04:30 +00: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/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

mailers

Update the tests after base change.

2014-08-22 11:08:30 +02:00

models

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

2014-08-20 17:14:26 +02:00

requests/api

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

routing

Display list of recipientgroups properly

2014-08-08 20:47:08 +02:00

services

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

support

Fix satellite tests

2014-08-06 09:52:56 +03:00

tasks/gitlab

Make backup version blocker test more robust

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

workers

Enable unsubscribe for admin emails

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

factories_spec.rb

Style changes from review with @randx

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

factories.rb

Fix project and notes specs

2014-08-01 17:54:44 +03:00

spec_helper.rb

Recreate tmp/tests on each test run

2014-07-31 19:24:53 +03:00