Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict ...

Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb

2015-01-13 18:22:38 -08:00

..

admin

Merge branch 'admin_email_groups_and_projects_select' into 'master'

2015-01-12 17:02:14 +00:00

dashboard

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

explore

Make Spinach test names consistent

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

profile

Fix the ssh keys test.

2014-12-30 11:47:13 +01:00

project

Merge remote-tracking branch 'ee/master' into ce-non-conflict

2015-01-13 18:22:38 -08:00

shared

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

snippets

Fix raw view for public snippets

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

groups_management.rb

Limit to only additions and block at project team level.

2014-12-16 10:01:37 +01:00

groups.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08: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