Luke "Jared" Bennett ca6cc6014e Merge branch 'master' into 'add-sentry-js-again-with-vue' ... # Conflicts: # config/webpack.config.js		2017-04-26 11:13:42 +00:00
..
assets	Merge branch 'master' into 'add-sentry-js-again-with-vue'	2017-04-26 11:13:42 +00:00
controllers	Show group name on flash container when group is created from Admin area	2017-04-25 12:43:21 +00:00
finders	Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion	2017-04-06 13:47:52 +01:00
helpers	Merge branch 'master' into 'add-sentry-js-again-with-vue'	2017-04-26 11:13:42 +00:00
mailers	Address review comments	2017-04-05 17:44:14 +01:00
models	Show correct size when MR diff overflows	2017-04-25 16:54:10 +01:00
policies	Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master'	2017-04-12 09:26:16 +00:00
presenters	Remove TriggerSchedulePresenter. This will go in another MR.	2017-04-06 23:46:59 +09:00
serializers	Merge branch 'usage-ping-port' into 'master'	2017-04-19 14:48:31 +00:00
services	Fix logic in Users::CreateService broken by the fix for OAuth users	2017-04-26 10:08:44 +02:00
uploaders	Periodically clean up temporary upload files to recover storage space	2017-04-10 08:48:44 +11:00
validators	Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.	2017-04-06 23:46:59 +09:00
views	Merge branch 'master' into 'add-sentry-js-again-with-vue'	2017-04-26 11:13:42 +00:00
workers	Refactor ExpirePipelineCacheWorker#perform	2017-04-24 10:23:41 +02:00