gitlabhq/app/views/commits
Riyad Preukschas 3022786948 Merge commit 'master' into discussions
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
..
_commit.html.haml Remove unused methods 2013-01-05 13:11:15 +02:00
_commit_box.html.haml use ui-box as for all 2013-01-04 23:35:31 +02:00
_commits.html.haml Fixed styles, ProjectHook specs etc 2013-01-05 00:35:38 +02:00
_diff_head.html.haml Optimized commit diff views, now showing file size and file mode changes 2012-11-18 17:41:41 +01:00
_diffs.html.haml Rename commits/text_file partial to text_diff 2012-12-03 22:51:56 +01:00
_head.html.haml REpostiry, Team models 2013-01-03 21:09:18 +02:00
_text_diff.html.haml Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
show.atom.builder Fix atom feed links 2012-09-26 16:32:23 -04:00
show.html.haml Add 'breadcrumbs' helper for Commit breadcrumb links 2012-11-01 17:58:13 -04:00
show.js.haml Use Commits#show instead of Commits#index 2012-09-26 16:32:22 -04:00