Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee ...

Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md

2013-09-27 15:24:54 +03: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

Don't show users password change page if ldap users

2013-09-17 22:38:08 -04:00

project

Added spinach Tests for pivotaltracker service

2013-09-25 16:49:39 +02:00

public

Public area spinach tests

2013-07-29 17:07:03 +03:00

snippets

Typos fixed

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

steps

Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee

2013-09-27 15:24:54 +03:00

support

Improve timing problem in spinach test

2013-09-13 07:30:49 +09:00