Dmitriy Zaporozhets 92ef845fa5 Merge branch 'master' into 6-0-dev ...

Conflicts:
	VERSION

2013-07-12 16:16:20 +03:00

..

api

Merge branch 'master' into 6-0-dev

2013-07-12 14:42:35 +03:00

assets

move assets from lib directory to vendor

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

backup

Merge pull request #4264 from andrewwutw/fix-postgresql-restore

2013-07-11 09:52:43 -07:00

gitlab

Merge branch 'master' into 6-0-dev

2013-07-12 14:42:35 +03:00

redcarpet/render

Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451

2013-07-07 19:00:07 +02:00

support

Merge branch 'master' into 6-0-dev

2013-07-12 16:16:20 +03:00

tasks

Merge branch 'master' into 6-0-dev

2013-07-12 14:42:35 +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