Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable ...

Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb

2013-10-31 14:29:48 +02:00

..

admin

Fix typo in tests

2013-09-12 14:30:55 +02:00

dashboard

Merge Request on forked projects

2013-07-17 22:41:30 -04:00

group

Rename Group#people to Group#members

2013-07-12 19:01:39 +03:00

profile

Fix spinach profile tests

2013-10-09 17:01:04 +03:00

project

Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable

2013-10-31 14:29:48 +02:00

public

Public projects feature - step2

2013-09-24 22:14:28 +03:00

snippets

Typos fixed

2013-03-25 20:32:10 +04:00

steps

Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable

2013-10-31 14:29:48 +02:00

support

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00