Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee ...

Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

2015-02-04 18:19:22 -08:00

..

controllers

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

2015-02-04 18:19:22 -08:00

factories

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

2015-02-04 18:19:22 -08:00

features

Fix tests

2015-02-04 13:54:19 -08: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' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee

2015-02-04 18:19:22 -08: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 ce-into-ee

2015-02-04 18:19:22 -08:00

mailers

Merge branch 'master' into ee-master

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

models

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

2015-02-04 18:19:22 -08:00

requests/api

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

2015-02-04 18:19:22 -08:00

routing

Merge remote-tracking branch 'ce/master' into merge_ce

2015-01-29 11:34:43 -08:00

services

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

2015-02-04 18:19:22 -08:00

support

Add flatten-dir branch to seed repo

2015-01-10 22:48:16 -08: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' of dev.gitlab.org:gitlab/gitlabhq

2015-01-21 17:05:31 -08:00

spec_helper.rb

Try wear_merged! without argument

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