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

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

Conflicts:
	app/models/project.rb
	db/schema.rb

2015-04-20 19:19:27 +03:00

..

admin

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

2015-04-15 19:22:57 +03:00

dashboard

Revert "Fix and improve help rendering"

2015-04-15 12:24:44 -04:00

explore

Move group members index from /members to /group_members.

2015-03-15 13:51:11 +01:00

profile

Add location to user profile

2015-03-20 16:52:23 -07:00

project

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

2015-04-15 19:22:57 +03:00

shared

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

2015-04-15 19:22:57 +03:00

snippets

Fix raw view for public snippets

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

group_hooks.rb

Group level web hooks: tests

2015-03-12 20:46:10 +02:00

groups_management.rb

Fix project memeber management

2015-03-17 09:22:41 -07:00

groups.rb

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

2015-04-15 19:22:57 +03:00

invites.rb

Add spinach tests around accepting and declining invitations.

2015-04-14 18:04:29 +02: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 branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-25 09:16:09 -07:00