Dmitriy Zaporozhets 3962d33f98 Merge cross-reference refactoring with EE code

2015-05-13 14:39:57 +03:00

..

controllers

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

2015-05-13 14:10:14 +03:00

factories

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

2015-05-13 14:10:14 +03:00

features

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

2015-05-13 14:10:14 +03:00

finders

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

2015-05-05 10:18:27 +02:00

fixtures

Remove class and id attributes from SanitizationFilter whitelist

2015-05-08 12:31:34 -04:00

helpers

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

2015-05-13 14:10:14 +03:00

javascripts

Remove unneeded jasmine setup

2015-05-06 15:29:46 -04:00

lib

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

2015-05-13 14:10:14 +03:00

mailers

Revert "Allow to configure smtp and sendmail in gitlab.yml"

2015-05-06 17:39:18 +03:00

models

Merge cross-reference refactoring with EE code

2015-05-13 14:39:57 +03:00

requests/api

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

2015-05-05 10:18:27 +02:00

routing

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

2015-04-24 11:22:54 +03:00

services

Merge cross-reference refactoring with EE code

2015-05-13 14:39:57 +03:00

support

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

2015-05-13 14:10:14 +03:00

tasks/gitlab

Merge branch 'fix-backup-spec-regexp' into 'master'

2015-04-03 08:49:47 +00:00

workers

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

2015-04-15 19:22:57 +03:00

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

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

2015-05-13 14:10:14 +03:00

spec_helper.rb

Make sure test license is setup in all tests.

2015-05-07 20:01:45 +02:00