merge rails / js
update ignore