Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb

2014-03-18 11:15:01 +02:00

..

backend

updated fork feature to use gitlab-shell for v5 of gitlab

2013-04-15 01:54:52 -04:00

ldap

Fix ldap_user_auth_spec

2014-03-10 19:16:43 +02:00

satellite

Merge branch 'master' into reference_relative_links

2014-01-24 14:02:11 +01:00

popen_spec.rb

Make the Gitlab::Popen path argument optional

2014-02-25 11:58:22 +01:00

reference_extractor_spec.rb

Make changes to tests

2014-01-22 21:03:52 +02:00

upgrader_spec.rb

Fix upgrader

2013-12-23 13:49:21 +02:00

version_info_spec.rb

Add Gitlab::VersionInfo class to fix and simplify version check.

2013-05-08 17:36:48 +09:00