Dmitriy Zaporozhets 2e07865f16 Merge remote-tracking branch 'origin/side-by-side' ...

Conflicts:
	CHANGELOG

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

2013-11-28 19:26:21 +02:00

..

assets

Drop rjs from Infinite scrolling

2013-11-28 11:38:20 +02:00

contexts

Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects

2013-11-27 11:51:46 +02:00

controllers

Drop rjs from Infinite scrolling

2013-11-28 11:38:20 +02:00

helpers

Improve UX of project visiblity level. Improve "Public Access" help page

2013-11-27 13:13:33 +02:00

mailers

Fix minor errors/annoyances in email templates

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

models

Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects

2013-11-27 11:51:46 +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 remote-tracking branch 'origin/side-by-side'

2013-11-28 19:26:21 +02:00

workers

Removed Project#discover_default_branch since it not needed any more

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