Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload ... # Conflicts: # app/views/projects/issues/_form.html.haml # app/views/projects/merge_requests/_form.html.haml # app/views/projects/merge_requests/_new_submit.html.haml # app/views/projects/milestones/_form.html.haml # app/views/projects/notes/_form.html.haml # app/views/projects/wikis/_form.html.haml # config/routes.rb # spec/controllers/projects_controller_spec.rb		2015-02-24 14:54:39 +01:00
..
assets	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
controllers	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
finders	Fix trending projects ordering	2015-02-18 22:23:24 -08:00
helpers	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
mailers	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
models	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
services	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
uploaders	Fix URL to uploaded file.	2015-02-20 16:01:37 +01:00
views	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
workers	gitlab.com importer: refactorig	2015-02-05 17:03:43 -08:00