Commit Graph

166 Commits

Author SHA1 Message Date
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
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
75f1638cd6 fixing conflicts [#6] 2015-07-16 21:29:44 +02:00
rgarcia
c24c78e5e7 fixing conflicts [#5] 2015-07-16 20:18:33 +02:00
rgarcia
e88832b5a3 fixing conflicts [#6] 2015-07-16 20:14:18 +02:00
Juanjo Bazán
24fb2765b9 Merge pull request #4 from AyuntamientoMadrid/capybara-4
Capybara configuration
2015-07-16 20:07:44 +02:00
rgarcia
f618a9f45d adds devise configuration [#6] 2015-07-16 19:47:54 +02:00
rgarcia
9b3d41552d configures responders gem [#5] 2015-07-16 19:25:47 +02:00
rgarcia
223eb06da2 configures capybara [#4] 2015-07-16 17:07:12 +02:00
rgarcia
155a96d8fc configures foundation #2 2015-07-16 17:03:05 +02:00
rgarcia
4aa16e78c2 configure rspec 2015-07-15 13:59:26 +02:00
rgarcia
8db3630837 initial commit 2015-07-15 13:32:13 +02:00