Dmitriy Zaporozhets 1f43fa20d3 Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce ...

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

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md

2013-12-23 12:57:22 +02:00

..

api

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 12:57:22 +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 '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 12:57:22 +02:00

redcarpet/render

Correct check.

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

support

Merge pull request #5617 from zeeZ/nginx-proxy

2013-12-16 03:54:04 -08:00

tasks

Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq

2013-12-04 14:56:19 +00: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