gitlab-org--gitlab-foss/app/views/projects/notes
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
2013-08-08 12:22:09 +03: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 Move diff parsing to own class. Correctly identify note diff line 2013-08-04 20:43:49 +03:00
_discussion.html.haml Merge branch 'master' into karlhungus-mr-on-fork 2013-08-08 12:22:09 +03:00
_discussion_diff.html.haml Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
_discussion_reply_button.html.haml Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
_form.html.haml Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
_form_errors.html.haml Minor UI improve for dashboard events 2013-07-04 17:10:34 +03:00
_note.html.haml It was hard to click on small edit icon for comment 2013-08-04 16:46:46 +03:00
_notes.html.haml Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
_notes_with_form.html.haml Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
create.js.haml Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
index.js.haml Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00