Clement Ho 0d77b9c9ff Merge branch 'master' into 'bootstrap4' ... # Conflicts: # app/views/projects/jobs/index.html.haml		2018-04-24 00:21:38 +00:00
..
assets	Fix explore groups landing toggle	2018-04-23 15:21:52 -05:00
controllers	Removes 'no job log' from trace action	2018-04-22 10:55:17 -05:00
finders	Add 2FA filter to users API for admins only	2018-04-23 11:54:45 +03:00
helpers	Fix bug whereby milestone tooltip title was null	2018-04-19 19:16:25 -05:00
mailers
models	Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"	2018-04-23 16:59:53 +00:00
policies
presenters	Changed anchor not to have the js prefix, add i18n	2018-04-20 12:48:04 -05:00
serializers
services
uploaders	Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"	2018-04-23 16:59:53 +00:00
validators
views	Merge branch 'master' into 'bootstrap4'	2018-04-24 00:21:38 +00:00
workers