Thankfully, Edinburgh airport has relaxed it liquid rules. You are now allowed up to 2 litres, across one or more containers and they stay in your bag while going through security.