Commit graph

21 commits

Author SHA1 Message Date
Yorick Peterse
cd74c1434e
Added Cop to blacklist the use of serialize
This Cop blacklists the use of ActiveRecord's "serialize" method, except
for cases where we already use this.
2017-05-31 14:03:37 +02:00
Douwe Maan
7c479d88a9 Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-23 15:37:05 -05:00
Douwe Maan
b202b42cfe Link to outdated diff in older MR version from outdated diff discussion 2017-04-08 14:37:46 -05:00
Douwe Maan
cc656a1199 Refactor resolvability checks based on type 2017-04-06 10:51:45 -05:00
Douwe Maan
c319f21141
Address review comments 2017-04-05 17:44:14 +01:00
Douwe Maan
21e10888c3
Address review comments 2017-04-05 17:44:14 +01:00
Douwe Maan
2058e71e63
Extract commonalities between DiffDiscussion and LegacyDiffDiscussion 2017-04-05 17:44:14 +01:00
Douwe Maan
08bbb9fce6
Add option to start a new discussion on an MR 2017-04-05 17:44:14 +01:00
Douwe Maan
080924f979 Fix bug where notes weren’t shown in discussion when the code had changed after creation 2016-08-19 12:38:40 -05:00
Douwe Maan
4a13aa9f34 Store discussion_id on Note for faster discussion lookup. 2016-08-17 12:16:46 -05:00
Douwe Maan
538e66d71c Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
#	app/models/discussion.rb
#	db/schema.rb
2016-08-03 15:32:00 -07:00
Paco Guzman
c86c1905b5 switch from diff_file_collection to diffs
So we have raw_diffs too
2016-08-03 07:00:20 +02:00
Douwe Maan
ce1843b7de Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
#	db/schema.rb
2016-07-28 16:57:42 -06:00
Ahmad Sherif
e4027e4070 Reduce number of queries made for merge_requests/:id/diffs 2016-07-28 16:52:19 +02:00
Douwe Maan
35ce7aae01 Use sha1 of discussion ID. 2016-07-25 22:51:26 -06:00
Douwe Maan
c5555c8a84 Don't fail when a LegacyDiffNote didn't store the right diff 2016-07-15 17:32:49 -05:00
Douwe Maan
a27462a5c6 Extract parts of LegacyDiffNote into DiffOnNote concern and move part of responsibility to other classes 2016-07-06 18:50:59 -04:00
Douwe Maan
fa42ffa119 Restore old behavior around diff notes to outdated discussions 2016-06-22 22:09:11 -04:00
Z.J. van de Weg
91a7b9333b Incorportate feedback 2016-06-01 12:10:08 +02:00
Douwe Maan
7848d54f5b Clean up LegacyDiffNote somewhat 2016-05-13 17:31:58 -05:00
Douwe Maan
99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00