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

development

Start writing doc about GitLab architecture for developers

2013-11-25 11:47:55 +02:00

install

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

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

legal

Fix numbering by indenting.

2013-10-30 17:27:40 -07:00

markdown

Fix Markdown help page: escape file link syntax example to leave it unprocessed

2013-10-30 12:27:44 +02:00

raketasks

Merge pull request #3006 from jweslley/master

2013-09-29 05:24:11 -07:00

release

Merge branch 'master' into full-post-to-oss-security

2013-11-19 16:38:43 +01:00

security

Add documentation to help section, rack_attack as example

2013-09-30 11:10:46 +02:00

update

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

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