gitlabhq/app/views/merge_requests
Dmitriy Zaporozhets 08994f3f60 Merge remote-tracking branch 'origin/merge_button'
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
2012-04-21 12:22:56 +03:00
..
_commits.html.haml MR commits suppressed if too many. few icons 2012-04-17 22:08:07 +03:00
_diffs.html.haml Compare view for commits 2012-02-06 22:32:04 +02:00
_form.html.haml migrated to bootstrap 2 2012-04-10 08:51:08 +03:00
_head.html.haml Bootstrap: btn replacing 2012-01-27 09:19:55 +02:00
_how_to_merge.html.haml added = preserve to some pre statements 2012-04-11 19:13:38 +00:00
_merge_request.html.haml better MR list, dashboard pollished 2012-03-22 22:57:04 +02:00
automerge.js.haml Auto-merge: 'already can not be merged' alert 2012-04-16 23:05:08 +03:00
branch_from.js.haml Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
branch_to.js.haml Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
commits.js.haml merge request show page refactored 2011-12-13 23:56:04 +02:00
diffs.js.haml merge request show page refactored 2011-12-13 23:56:04 +02:00
edit.html.haml Bootstrap: Merge Request -> Show 2012-01-28 17:21:00 +02:00
index.html.haml b2 fixes 2012-04-10 21:39:04 +03:00
new.html.haml Bootstrap: Merge Request -> Show 2012-01-28 17:21:00 +02:00
show.html.haml Merge remote-tracking branch 'origin/merge_button' 2012-04-21 12:22:56 +03:00