Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master ...

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

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb

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

..

admin

Merge branch '7-4-stable' into to_ee_stable_from_ce_stable

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

dashboard

Merge CE master into EE master

2014-11-13 17:05:12 +02:00

explore

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

profile

Supporting for multiple omniauth provider for the same user

2014-12-04 13:03:55 +02:00

project

Merge branch 'master' into ee-master

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

shared

Merge branch 'master' into ee-master

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

snippets

Fix raw view for public snippets

2014-10-29 16:11:28 +02:00

groups.rb

Factor audit events tests.

2014-11-24 09:01:01 +01:00

search.rb

Remove def project from tests that inherit it.

2014-09-28 13:44:04 +02:00

snippet_search.rb

Replace old spinach step definitions with step.

2014-09-22 10:01:50 +02:00

user.rb

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

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