Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork ... Conflicts: app/contexts/filter_context.rb app/contexts/search_context.rb app/models/merge_request.rb app/models/note.rb app/views/shared/_merge_requests.html.haml spec/controllers/commit_controller_spec.rb spec/services/notification_service_spec.rb		2013-08-08 12:22:09 +03:00
..
api	Merge branch 'master' into karlhungus-mr-on-fork	2013-08-08 12:22:09 +03:00
assets	move assets from lib directory to vendor	2012-05-29 17:56:48 +05:00
backup	move backup logic to lib. Fixed removing outdated backups	2013-08-05 12:26:33 +03:00
gitlab	Merge branch 'master' into karlhungus-mr-on-fork	2013-08-08 12:22:09 +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	move backup logic to lib. Fixed removing outdated backups	2013-08-05 12:26:33 +03:00
event_filter.rb	Constants in Events looks good now	2013-02-13 15:48:16 +04:00
extracts_path.rb	Update main calls to gitlab_git	2013-08-05 16:51:04 +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