gitlabhq/app/views/merge_requests
Riyad Preukschas db2c15369c Merge branch 'master' into discussions
Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
..
show Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
_form.html.haml Refactor issues, Remove ajax 2012-12-19 06:14:05 +03:00
_head.html.haml Fully embrace Ruby 1.9 hash syntax 2012-08-10 18:25:15 -04:00
_merge_request.html.haml Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
_show.html.haml Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
automerge.js.haml Auto-merge: 'already can not be merged' alert 2012-04-16 23:05:08 +03:00
branch_from.js.haml Fix 404 errors on Merge Request -> new 2012-10-31 14:29:42 +02:00
branch_to.js.haml Fix 404 errors on Merge Request -> new 2012-10-31 14:29:42 +02:00
commits.js.haml Fully embrace Ruby 1.9 hash syntax 2012-08-10 18:25:15 -04:00
diffs.html.haml Update notes views to support discussions 2012-12-03 22:51:55 +01:00
diffs.js.haml Refactor diff notes creation 2012-12-03 22:51:56 +01:00
edit.html.haml Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
index.html.haml Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
new.html.haml Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
show.html.haml Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
show.js.haml Refactor discussion reply 2012-12-03 22:51:56 +01:00