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

..

assets

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

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

finders

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

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

helpers

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

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

mailers

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

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

models

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

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

services

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

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

uploaders

Revert "Merge pull request #7349 from srna/patch-1"

2014-12-05 15:33:22 +01:00

views

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

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

workers

Fix conflict in merge request controller

2015-01-14 09:38:00 -08:00