Commit Graph

14 Commits

Author SHA1 Message Date
Juanjo Bazán
b6d2a5efd6 uses new hash syntax by default 2015-07-18 21:49:36 +02:00
rgarcia
b060ffaa17 fixing conflicts [#9] 2015-07-18 18:19:00 +02:00
rgarcia
73c3890027 fixing conflicts [#9] 2015-07-18 18:16:10 +02:00
rgarcia
b8e41551f9 configures acts_as_votable [#9] 2015-07-18 18:09:48 +02:00
rgarcia
28e36b76e2 fixing conflicts [#7] 2015-07-18 18:04:23 +02:00
rgarcia
fce0068bf4 fixing conflicts [#7] 2015-07-18 17:40:38 +02:00
rgarcia
05705f3174 configures act_as_commentable_with_threading gem [#7] 2015-07-18 17:38:33 +02:00
rgarcia
6adedf45b8 configures act_as_taggable [#8] 2015-07-18 17:23:00 +02:00
rgarcia
c55021e18b fixing conflicts [#8] 2015-07-18 15:04:36 +02:00
rgarcia
62d0a385ab adds first name and last name to users 2015-07-17 19:52:55 +02:00
rgarcia
75f1638cd6 fixing conflicts [#6] 2015-07-16 21:29:44 +02:00
rgarcia
f618a9f45d adds devise configuration [#6] 2015-07-16 19:47:54 +02:00
rgarcia
b1f19f124d removes unused column [#5] 2015-07-16 19:24:27 +02:00
rgarcia
b216470d59 adds debate model 2015-07-15 21:07:15 +02:00