Sort:  

From my study capillary action and capillarity are the same. The capillary action is a result of both cohesion and adhesion as I read from sources. Where surface tension comes in is through cohesion. Do check the sources from more info