Clement Ho 56de42b738 Fix bad merge conflict		2018-05-23 15:05:33 -05:00
..
assets	Fix bad merge conflict	2018-05-23 15:05:33 -05:00
controllers	Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master'	2018-05-23 16:53:29 +00:00
finders	Merge branch '44799-api-naming-issue-scope' into 'master'	2018-05-21 08:56:42 +00:00
helpers	Merge branch 'master' into bootstrap4	2018-05-23 14:45:32 -05:00
mailers	Backport 5480-epic-notifications from EE	2018-05-07 12:58:47 -06:00
models	Use the new CacheableAttributes concern in the ApplicationSetting and Appearance models	2018-05-23 16:14:43 +02:00
policies	Refactor out duplication in runner_policy.rb	2018-05-16 11:42:09 +02:00
presenters	Respect the inheritance chain between Ci::Build and CommitStatus	2018-05-16 15:59:51 -05:00
serializers	Exclude coverage data from the pipelines page	2018-05-17 13:53:00 +02:00
services	Bring CE-EE parity to app/services/boards/issues/create_service.rb	2018-05-22 14:16:56 -05:00
uploaders	Use the new CacheableAttributes concern in the ApplicationSetting and Appearance models	2018-05-23 16:14:43 +02:00
validators	…
views	Merge branch 'master' into bootstrap4	2018-05-23 14:45:32 -05:00
workers	remove the `Upload` redefinition in `MigrateUploadsWorker`	2018-05-08 10:04:52 -04:00