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
..
_commit.html.haml	Small css fixes	2014-02-26 10:13:11 +02:00
_commits.html.haml	Convert span into col-md	2013-12-30 23:55:15 +02:00
_diff_head.html.haml	Move projects controllers/views in Projects module	2013-06-23 19:47:22 +03:00
_diffs.html.haml	Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments	2014-03-13 23:11:16 +02:00
_head.html.haml	Add bottom margin to nav-tabs	2014-02-15 13:41:48 +02:00
_image.html.haml	Fix onion image control	2014-02-24 21:57:59 +02:00
_inline_commit.html.haml	Improve commit render performnace for MR show page	2014-01-22 15:54:53 +02:00
_parallel_view.html.haml	Conventional naming for diff modes.	2013-11-27 09:00:14 +01:00
_text_file.html.haml	diff view on commit with parallel diff view	2013-11-17 16:35:34 +01:00
show.atom.builder	Fix commits atom feed	2013-12-10 12:11:29 +02:00
show.html.haml	Replace gif animation with font icon spinner	2014-02-05 20:30:57 +02:00