Douwe Maan e97a87433b Merge branch 'mr-conflict-notification' into 'master' ... MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042		2018-05-24 08:49:54 +00:00
..
assets	Merge branch '39710-search-placeholder-cut-off' into 'master'	2018-05-23 17:40:57 +00: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	CE: Use render_if_exists to hide EE specific codes	2018-05-23 12:56:11 +00:00
mailers	Plural reason(s)	2018-05-18 09:50:01 +08:00
models	Merge branch 'mr-conflict-notification' into 'master'	2018-05-24 08:49:54 +00:00
policies	Refactor out duplication in runner_policy.rb	2018-05-16 11:42:09 +02:00
presenters	Merge branch 'mr-conflict-notification' into 'master'	2018-05-24 08:49:54 +00:00
serializers	Exclude coverage data from the pipelines page	2018-05-17 13:53:00 +02:00
services	Merge branch 'mr-conflict-notification' into 'master'	2018-05-24 08:49:54 +00: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 'mr-conflict-notification' into 'master'	2018-05-24 08:49:54 +00:00
workers	remove the Upload redefinition in MigrateUploadsWorker	2018-05-08 10:04:52 -04:00