deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
gitlabhq/app/views/notes
History
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
..
_diff_note_link.html.haml Fix comment and reply buttons 2013-01-02 20:49:27 +01:00
_diff_notes_with_reply.html.haml Refactor discussion reply 2012-12-03 22:51:56 +01:00
_discussion.html.haml Fix dicussion headers 2012-12-03 22:51:57 +01:00
_discussion_diff.html.haml Refactor discussion reply 2012-12-03 22:51:56 +01:00
_discussion_reply_button.html.haml Fix comment and reply buttons 2013-01-02 20:49:27 +01:00
_form.html.haml Smaller fixes 2013-01-15 00:27:26 +01:00
_form_errors.html.haml Fix handling form errors. 2012-12-03 22:51:57 +01:00
_note.html.haml Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
_notes.html.haml Update notes views to support discussions 2012-12-03 22:51:55 +01:00
_notes_with_form.html.haml Pull together and rename Notes partials 2012-12-03 22:51:57 +01:00
_reversed_notes_with_form.html.haml Pull together and rename Notes partials 2012-12-03 22:51:57 +01:00
create.js.haml Fix handling form errors. 2012-12-03 22:51:57 +01:00
index.js.haml Pull together and rename Notes partials 2012-12-03 22:51:57 +01:00