iagirre 81b1fb1a72 Fixed some conflicts automatically merged that didn't realised before they were there

2017-10-18 10:27:41 +02:00

..

assets

uses underscore for ids names

2017-10-17 13:26:27 +02:00

controllers

Merge remote-tracking branch 'consul/master' into iagirre-poll-stats

2017-10-18 09:48:02 +02:00

helpers

Rubocop fixes and rubocop todo update for those that can't be done right now

2017-10-17 22:23:53 +02:00

mailers

Fix all rubocop Metrics/LineLength issues (140+)

2017-07-10 13:22:49 +02:00

models

Merge remote-tracking branch 'consul/master' into iagirre-poll-stats

2017-10-18 09:48:02 +02:00

views

Fixed some conflicts automatically merged that didn't realised before they were there

2017-10-18 10:27:41 +02:00