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
..
assets	Merge branch 'master' into diff-line-comment-vuejs	2016-08-03 15:32:00 -07:00
controllers	Merge branch 'master' into diff-line-comment-vuejs	2016-08-03 15:32:00 -07:00
finders	State specific default sort order for issuables	2016-08-01 11:28:56 +02:00
helpers	Merge branch 'master' into diff-line-comment-vuejs	2016-08-03 15:32:00 -07:00
mailers	Send notification email when all discussions are resolved	2016-07-28 21:00:32 -06:00
models	Merge branch 'master' into diff-line-comment-vuejs	2016-08-03 15:32:00 -07:00
services	Merge branch 'master' into diff-line-comment-vuejs	2016-08-03 15:32:00 -07:00
uploaders	Remove magic comments from Ruby files (!5456)	2016-07-24 07:08:45 +02:00
validators	refactor url validator to use sanitizer for check	2016-07-01 09:02:45 +02:00
views	Merge branch 'master' into diff-line-comment-vuejs	2016-08-03 15:32:00 -07:00
workers	Use commit deltas when counting files in IrkerWorker	2016-08-03 19:26:10 +02:00