Dmitriy Zaporozhets 6a9aed1e87 Merge branch 'master' into 6-0-dev ... Conflicts: CHANGELOG VERSION app/views/admin/teams/projects/new.html.haml app/views/projects/teams/available.html.haml doc/install/installation.md		2013-07-10 14:03:00 +03:00
..
api	Merge branch 'master' into 6-0-dev	2013-07-10 14:03:00 +03:00
assets
backup	fixes for gitlab restore with non-standard backup and repo dirs	2013-05-30 09:58:36 -04:00
gitlab	Merge branch 'master' into 6-0-dev	2013-07-08 09:50:10 +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	Fix unicorn init and config	2013-07-08 19:28:59 +03:00
tasks	store and display public key fingerprint	2013-06-24 20:07:21 +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
static_model.rb	Fixed styles, ProjectHook specs etc	2013-01-05 00:35:38 +02:00