delta/gitlab/gitlab-ce.git/features/steps/shared/diff_note.rb, branch fix-commit-status gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into faster-diffs 2016-07-07T22:05:34+00:00 Douwe Maan douwe@selenight.nl 2016-07-07T22:05:34+00:00 5a8f727fd5400634a99eae82e7bac5e26cf36d4e # Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb 
# Conflicts:
#	app/helpers/notes_helper.rb
#	app/views/projects/diffs/_line.html.haml
#	app/views/projects/diffs/_parallel_view.html.haml
#	app/views/projects/diffs/_text_file.html.haml
#	features/steps/shared/diff_note.rb
Display new diff notes and allow creation through the web interface 2016-07-06T22:51:00+00:00 Douwe Maan douwe@selenight.nl 2016-06-20T17:23:46+00:00 29d574868a044fbfdf7a2458fbb3d951cfe58171 






fix up tests
2016-07-06T06:29:57+00:00

Luke "Jared" Bennett
lbennett@gitlab.com

2016-07-03T20:01:36+00:00

50dfdf0296ae307d0b22ae8bbd1b52dca9fbaea9

Added more exceptions

Added handling inline view type





Added more exceptions

Added handling inline view type







Diffs will create button/diff form on demand no on server side
2016-07-06T06:29:57+00:00

Jacob Schatz
jschatz1@gmail.com

2016-06-18T15:19:57+00:00

e065f4848b257256141752e6498398cd68fa7786












Update specs
2016-05-13T22:31:58+00:00

Douwe Maan
douwe@selenight.nl

2016-05-13T19:53:42+00:00

c452fa8124ffe18e2e74e14491dcb3e419e60057












Update click_diff_line
2016-04-14T14:10:40+00:00

Annabel Dunstone
annabel.dunstone@gmail.com

2016-04-13T23:40:14+00:00

2f81baf4767df7ce0144a63b4e451b7d8e09f86a












Diff design updates
2016-04-07T22:33:18+00:00

Annabel Dunstone
annabel.dunstone@gmail.com

2016-04-01T19:27:39+00:00

dab4ac54b691f1c832b1fe444859c3183a231411












Update diff_comments tests
2016-04-07T22:33:18+00:00

Annabel Dunstone
annabel.dunstone@gmail.com

2016-03-31T21:34:21+00:00

87b3c73ea560d6091a17e7b759864b90911f5f1c












Tests update
2016-04-04T09:48:49+00:00

Phil Hughes
me@iamphill.com

2016-03-30T15:20:43+00:00

29f414aa5a4d63d5676d5c0e4d89584f45ef8c35












Updated tests
2016-03-04T13:52:29+00:00

Phil Hughes
me@iamphill.com

2016-03-04T13:52:29+00:00

f95f242cfad4fb0032caecea47964d78c1f652bc