Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb

2014-01-21 18:15:49 +02:00

..

api

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce

2014-01-21 18:15:49 +02:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Remove duplication in Backup::Manager

2013-11-06 14:02:28 +01:00

gitlab

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce

2014-01-21 18:15:49 +02:00

redcarpet/render

Correct check.

2013-11-08 16:34:15 +01:00

support

Update the init.d file to the correct locationof the example defaults file

2014-01-08 22:54:03 +00:00

tasks

Rephrase LDAP check script output

2014-01-21 11:05:03 +01:00

event_filter.rb

Constants in Events looks good now

2013-02-13 15:48:16 +04:00

extracts_path.rb

Fix blob and repo stuff after gitlab_git v3

2013-10-01 18:26:55 +03:00

file_size_validator.rb

Fully embrace Ruby 1.9 hash syntax

2012-08-10 18:25:15 -04:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00