Clement Ho 66d3894d53 Fix bad merge conflict		2018-04-09 12:05:46 -05:00
..
assets	Merge branch 'master' into 'bootstrap4'	2018-04-09 17:04:05 +00:00
controllers	Merge branch 'sh-handle-legacy-archive-requests' into 'master'	2018-04-09 07:49:51 +00:00
finders	Allow assigning and filtering issuables by ancestor group labels	2018-04-04 15:40:29 +00:00
helpers	Fix bad merge conflict	2018-04-09 12:05:46 -05:00
mailers	Fix body of email when commits are pushed to an MR	2018-04-03 13:22:25 +01:00
models	Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master'	2018-04-09 15:36:56 +00:00
policies	Support Deploy Tokens properly without hacking abilities	2018-04-06 21:20:16 -05:00
presenters	Removes deploy tokens presenter	2018-04-06 21:20:17 -05:00
serializers	Resolve "Show `failure_reason` and upgrade tooltips of jobs"	2018-04-05 21:04:42 +00:00
services	Merge branch 'blackst0ne-rails5-fix-frozen-array' into 'master'	2018-04-09 11:20:32 +00:00
uploaders	Add `direct_upload` setting for artifacts	2018-04-05 15:01:14 +02:00
validators	Rename allow_private_networks to allow_local_network	2018-04-02 17:24:19 +02:00
views	Fix bad merge conflict	2018-04-09 12:05:46 -05:00
workers	Work around Ruby 2.3.7 bug by defining prepended class methods needed for tests	2018-04-09 06:46:33 -07:00