Dmitriy Zaporozhets b2fb6e0e0c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	app/services/merge_requests/build_service.rb
	app/views/layouts/_head.html.haml

2015-02-20 16:02:25 -08:00

..

admin

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

2015-02-16 11:50:30 -08:00

dashboard

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

2015-02-16 11:50:30 -08:00

explore

Make Spinach test names consistent

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

profile

Revert "Fix broken access control and refactor avatar upload"

2015-02-19 08:57:35 -08:00

project

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-20 16:02:25 -08:00

shared

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-02-18 17:44:29 -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

2015-02-19 12:01:56 -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