Dmitriy Zaporozhets cf413ffb75 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6 ...

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

Conflicts:
	LICENSE
	VERSION
	db/schema.rb
	features/steps/group/group.rb
	lib/api/internal.rb

2014-02-19 14:55:07 +02:00

..

api

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

2014-02-19 14:55:07 +02:00

assets

move assets from lib directory to vendor

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

backup

Report failure of DB backup commands

2014-01-23 11:19:43 +01:00

gitlab

Dump LDAP objects into the log for debugging

2014-02-12 15:51:30 +01:00

redcarpet/render

Headers have ids and link to their own id.

2014-02-11 16:23:33 +01:00

support

Add a custom 502 page

2014-01-28 10:19:22 +01:00

tasks

Merge pull request #5520 from gabetax/rake_group_bulk_add_permissions

2014-02-12 09:40:40 +02:00

event_filter.rb

Constants in Events looks good now

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

extracts_path.rb

Improve code according to new gitlab_git

2014-02-04 14:46:15 +02: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