The second one. But take a look at the following two examples.
Tell me when she comes.
Tell me when she will come.
The first one means that I want you to tell me (about sth) the moment she appears / the moment I see her.
The second sentence means that I want you to tell me the time whe she will come. Something like: 'Tell me the time when she will come'.