Valery Sizov e769822595 Merge branch '7-4-stable' into to_ee_stable_from_ce_stable ...

Conflicts:
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	features/admin/groups.feature
	features/steps/admin/groups.rb

2014-10-20 19:59:36 +03:00

..

assets

Merge branch 'ce_upstream' into 'master'

2014-10-16 14:01:48 +00:00

controllers

Merge branch '7-4-stable' into to_ee_stable_from_ce_stable

2014-10-20 19:59:36 +03:00

finders

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

helpers

Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync

2014-10-15 14:50:24 +02:00

mailers

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

models

Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync

2014-10-15 14:50:24 +02:00

services

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge branch '7-4-stable' into to_ee_stable_from_ce_stable

2014-10-20 19:59:36 +03:00

workers

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

2014-10-03 16:18:40 +03:00