Sean McGivern 33a4439e8f Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email' ... # Conflicts: # db/schema.rb		2018-04-10 10:25:59 +00:00
..
assets	Merge branch '40487-axios-pipelines' into 'master'	2018-04-10 10:15:12 +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	Projects and groups badges settings UI	2018-04-08 10:20:05 +00:00
mailers	Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'	2018-04-10 10:25:59 +00:00
models	Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'	2018-04-10 10:25:59 +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 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'	2018-04-10 10:25:59 +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	Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'	2018-04-10 10:25:59 +00:00
workers	Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'	2018-04-10 10:25:59 +00:00