Douwe Maan f3e95aae7a Merge branch 'master' into 'web-hooks-log-pagination' ... # Conflicts: # db/schema.rb		2018-07-03 15:46:23 +00:00
..
fixtures	DRY group creation code in nested groups fixtures	2018-07-02 18:06:11 +03:00
migrate	Fixed pagination of web hook logs	2018-07-03 14:24:17 +02:00
optional_migrations	Migration to add/drop primary key constraints for composite keys.	2018-05-21 17:56:57 +02:00
post_migrate	Merge branch 'temporarily-remove-mr-diffs-migration' into 'master'	2018-07-03 11:36:09 +00:00
schema.rb	Merge branch 'master' into 'web-hooks-log-pagination'	2018-07-03 15:46:23 +00:00
seeds.rb	…