Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable ...

Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb

2013-10-31 14:29:48 +02:00

..

api

Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable

2013-10-31 14:29:48 +02:00

assets

move assets from lib directory to vendor

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

backup

Skip rather than fail empty wikis during backup

2013-10-10 16:07:39 +02:00

gitlab

Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable

2013-10-31 14:29:48 +02:00

redcarpet/render

Skip relative links render in help page.

2013-10-11 21:41:33 +02:00

support

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

2013-10-16 10:08:53 +00:00

tasks

Count sidekiq processes using String#scan

2013-10-17 12:01:29 +02: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