Sean McGivern 36838a843e Merge branch 'master' into '3867-port-to-ce' ... # Conflicts: # db/schema.rb		2018-02-02 11:58:32 +00:00
..
assets	Merge branch 'fl-mr-widget-1' into 'master'	2018-02-02 10:25:26 +00:00
controllers	port of 594e6a0a625^..f74c90f68c6	2018-02-01 12:14:46 -05:00
finders	Include subgroup issuables on the group page	2018-02-01 07:04:37 +01:00
helpers	Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master'	2018-02-01 20:49:08 +00:00
mailers	Initial work to add notification reason to emails	2018-01-16 19:17:55 -06:00
models	fix specs	2018-02-01 12:14:46 -05:00
policies	Hide pipeline schedule 'take ownership' for current owner	2018-02-01 17:25:13 +00:00
presenters	Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'	2018-01-16 17:04:51 -08:00
serializers	Check MR state before submitting queries for discussion state	2018-01-29 23:53:47 -02:00
services	port of 594e6a0a625^..f74c90f68c6	2018-02-01 12:14:46 -05:00
uploaders	porting changes from upstream	2018-02-01 15:08:35 -05:00
validators	Second iteration of Move Kubernetes from service to Cluster page	2017-12-05 12:00:02 +00:00
views	Merge branch 'fix/improve-issue-note-dropdown' into 'master'	2018-02-02 09:00:55 +00:00
workers	port of 594e6a0a625^..f74c90f68c6	2018-02-01 12:14:46 -05:00