Paul Charlton 65eca13f7b Repair Regression caused by - !11573 ... some changes introduced by 4daa6da540, 26b6e299e1, 17898ce021 were regressed during today's merge conflict resolution of !11573. This commit serves to reapply those changes. /cc: @rspeicher @stanhu @mikegreiling		2017-07-11 14:23:51 +08:00
..
assets	Merge branch '34810-vue-pagination' into 'master'	2017-07-10 08:08:54 +00:00
controllers	Support multiple Redis instances based on queue type	2017-07-11 03:35:47 +00:00
finders	fix milestones finder failing spec	2017-07-07 19:21:00 -03:00
helpers	Also inject new route helpers into includers of GitlabRoutingHelper	2017-07-08 16:24:18 -05:00
mailers	Create and use project path helpers that only need a project, no namespace	2017-07-05 11:11:59 -05:00
models	Support multiple Redis instances based on queue type	2017-07-11 03:35:47 +00:00
policies	Merge from master(Fix conflicts)	2017-07-07 22:33:32 +09:00
presenters	Use new project_variables_path in this MR	2017-07-07 15:35:12 +09:00
serializers	Fix dashboard labels dropdown	2017-07-07 14:35:16 +01:00
services	Repair Regression caused by - !11573	2017-07-11 14:23:51 +08:00
uploaders	Fix filename method of GitlabUploader to return always real filename	2017-06-13 00:37:12 +02:00
validators	Implement ayufan validator2	2017-07-06 00:59:45 +09:00
views	Merge branch '2501-ce-port-update-welcome-page' into 'master'	2017-07-07 21:15:44 +00:00
workers	Improve exception description in bg migrations	2017-07-07 15:08:15 +02:00