Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict ...

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb

2015-02-05 22:01:05 -08:00

..

assets

Merge remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -08:00

controllers

Merge remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -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 remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -08:00

mailers

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

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

models

Merge remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -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 remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -08:00

workers

Merge remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -08:00