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
..
event	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
_commit.html.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
_event.html.haml	Add link to share via twitter to "created project" event.	2015-02-13 12:07:59 +01:00
_event_issue.atom.haml	Increase atom feed test coverage. Prevent 500 error if description is missing	2014-09-20 11:55:58 +03:00
_event_last_push.html.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
_event_merge_request.atom.haml	Increase atom feed test coverage. Prevent 500 error if description is missing	2014-09-20 11:55:58 +03:00
_event_note.atom.haml	Fix missing links and incorrect display of issue numbers for notes, comments, and merge requests	2014-07-26 12:43:04 -05:00
_event_push.atom.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
_events.html.haml	Drop rjs from Infinite scrolling	2013-11-28 11:38:20 +02:00