Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/assets/stylesheets/sections/commits.scss app/assets/stylesheets/sections/notes.scss app/views/projects/commits/_diffs.html.haml features/steps/project/merge_requests.rb		2014-03-13 23:11:16 +02:00
..
_diff_note_link.html.haml	Move projects controllers/views in Projects module	2013-06-23 19:47:22 +03:00
_diff_notes_with_reply.html.haml	Add button for toggling inline comments in diff view.	2014-02-22 21:21:12 +01:00
_diff_notes_with_reply_parallel.html.haml	Add button for toggling inline comments in diff view.	2014-02-22 21:21:12 +01:00
_discussion.html.haml	Use proper classes for sdiff content	2014-02-24 09:51:50 +02:00
_discussion_diff.html.haml	Use proper classes for sdiff content	2014-02-24 09:51:50 +02:00
_discussion_reply_button.html.haml	Move projects controllers/views in Projects module	2013-06-23 19:47:22 +03:00
_form.html.haml	Use more specific class names: grouped -> btn-grouped	2014-02-20 13:05:33 +02:00
_form_errors.html.haml	Minor UI improve for dashboard events	2013-07-04 17:10:34 +03:00
_note.html.haml	Headers have ids and link to their own id.	2014-02-11 16:23:33 +01:00
_notes.html.haml	Make note anchors actually work	2013-12-25 13:32:43 +02:00
_notes_with_form.html.haml	Switch Notes controller to use json	2013-12-25 22:32:23 +02:00