Connor Shea 7f4f959e9b Upgrade Kaminari from 0.16.3 to 0.17.0. ... Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170 Deprecates num_pages in favor of total_pages and includes Rails 5 support.		2016-05-31 14:14:16 -06:00
..
assets	Merge branch 'bendyorke-comment-fix' into 'master'	2016-05-27 17:11:41 +00:00
controllers	Add Application Setting to configure Container Registry token expire delay (default 5min)	2016-05-31 13:23:13 +02:00
finders	Merge branch 'fix-issue-17496' into 'master'	2016-05-25 20:28:17 +00:00
helpers	Merge branch 'style/enable-block-alignment-rubocop-lint' into 'master'	2016-05-30 17:26:57 +00:00
mailers	New confirmation email 🔥	2016-05-25 16:56:06 -04:00
models	Merge branch 'feature/improve_wiki_page_events' into 'master'	2016-05-31 18:10:23 +00:00
services	Merge branch 'feature/improve_wiki_page_events' into 'master'	2016-05-31 18:10:23 +00:00
uploaders
validators
views	Upgrade Kaminari from 0.16.3 to 0.17.0.	2016-05-31 14:14:16 -06:00
workers	Merge branch '17464-backport-email-syntax-highlighting' into 'master'	2016-05-19 21:12:53 +00:00