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

..

admin

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

2015-02-04 18:19:22 -08: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

Remove password strength indicator

2015-01-15 14:10:13 +01:00

project

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

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

shared

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

2015-01-29 11:34:43 -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 branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee

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

search.rb

Fixes the search test that fails whenever faker uses a name with Bar in it. Limit check to being within the search results div.

2014-12-08 16:44:06 -08: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