Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview ...

Conflicts:
	spec/routing/project_routing_spec.rb

2014-12-07 20:25:58 -07:00

..

discussions

same rendering for note diff as for usual diff

2014-10-15 13:03:27 +04:00

_commit_discussion.html.haml

…

_diff_notes_with_reply_parallel.html.haml

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

_diff_notes_with_reply.html.haml

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

_discussion.html.haml

Round avatars for notes timeline

2014-08-26 11:30:15 +03:00

_form_errors.html.haml

…

_form.html.haml

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

_note.html.haml

Merge branch 'upstream-master' into markdown-preview

2014-12-07 20:25:58 -07:00

_notes_with_form.html.haml

Basic UI implememntation of comments in timeline style

2014-08-26 11:30:14 +03:00

_notes.html.haml

…