Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb

2014-12-11 18:12:45 +02:00

..

controllers

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

2014-11-17 15:41:52 +01:00

factories

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

features

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

finders

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00

fixtures

Add trailing newline to all text files.

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

helpers

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00

javascripts

Add trailing newline to all text files.

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

lib

fix specs after merge CE -> EE

2014-12-08 13:11:33 +02:00

mailers

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

models

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

requests/api

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

routing

Merge branch 'master' into ce-changes

2014-12-11 18:12:45 +02:00

services

fix specs after merge CE -> EE

2014-12-08 13:11:33 +02:00

support

Merge pull request #7903 from cirosantilli/test-seed-reset

2014-11-05 15:22:37 +02:00

tasks/gitlab

Add rake task for google schema whitelisting.

2014-12-04 15:22:10 +01:00

workers

Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre

2014-09-15 11:24:51 +02:00

factories_spec.rb

Style changes from review with @randx

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

factories.rb

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

spec_helper.rb

Try wear_merged! without argument

2014-10-01 11:43:16 +03:00