Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 ...

Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

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

2013-11-29 10:01:43 +02:00

..

assets

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

contexts

Improve consistency: use file_path for API create/update/delete files

2013-11-20 10:03:50 +02:00

controllers

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

helpers

Nicer icons for enabled/disabled stuff

2013-11-20 14:05:42 +02:00

mailers

Fix minor errors/annoyances in email templates

2013-11-08 10:20:15 -06:00

models

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

observers

Project#default_branch use repo HEAD instead of DB value now

2013-11-06 18:45:39 +02:00

services

Correctly remove and re-create satellites when project transfer

2013-11-20 11:06:42 +02:00

uploaders

Fixes grack authentification under relative_url_root

2013-08-15 21:25:09 +02:00

views

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

workers

Removed Project#discover_default_branch since it not needed any more

2013-11-08 09:22:50 +02:00