Dmitriy Zaporozhets 8d70ac008d Merge branch 'master' into 6-0-dev ...

Conflicts:
	VERSION
	db/schema.rb

2013-06-22 11:19:12 +03:00

..

api

Remove all team resources except models. Move models to deprecated directory

2013-06-18 21:22:34 +03:00

assets

move assets from lib directory to vendor

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

backup

fixes for gitlab restore with non-standard backup and repo dirs

2013-05-30 09:58:36 -04:00

gitlab

Markdown now support users from groups

2013-06-22 00:06:21 +03:00

redcarpet/render

Fix pygment lexer 500 errors when an alias is used instead of a name.

2013-06-09 21:30:20 +02:00

support

Make the installation guide easier to follow for non-unix people.

2013-06-12 21:30:36 +02:00

tasks

You should not be able to remove a Group owner

2013-06-22 11:02:31 +03:00

event_filter.rb

Constants in Events looks good now

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

extracts_path.rb

Set @options in assing_ref_vars

2013-05-13 18:44:33 +09: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