decabeza 14d85406c3 Fix merge conflicts

2019-04-23 23:38:08 +02:00

..

controllers

Fix several rubocop warnings

2019-04-17 17:40:56 +02:00

factories

Merge branch 'master' into proposal-dashboard

2019-04-23 17:12:47 +02:00

features

Merge branch 'master' into proposal-dashboard

2019-04-23 17:12:47 +02:00

fixtures/files

Allow change map image from admin site customization

2019-01-24 14:55:01 +01:00

helpers

Fix hound warnings

2019-03-26 18:21:19 +01:00

lib

Remove all texts of decide madrid

2019-03-26 18:22:02 +01:00

mailers

Fix hound warnings

2019-03-26 18:21:19 +01:00

models

Merge branch 'master' into proposal-dashboard

2019-04-23 17:12:47 +02:00

requests/dashboard

Fix more hound warnings

2019-03-27 15:22:14 +01:00

shared

Merge branch 'master' into proposal-dashboard

2019-04-23 17:12:47 +02:00

support

Merge branch 'master' into proposal-dashboard

2019-04-23 17:12:47 +02:00

views/welcome

Change single quotes to double quotes

2019-02-15 11:40:39 +01:00

customization_engine_spec.rb

Change single quotes to double quotes

2019-02-15 11:40:39 +01:00

i18n_spec.rb

Merge pull request #3307 from consul/return_string_in_method_pluralize

2019-02-18 15:25:40 +01:00

rails_helper.rb

Change single quotes to double quotes

2019-02-15 11:40:39 +01:00

sessions_helper.rb

use Capybara.using_session method for multiple browsers specs

2018-12-02 18:12:30 +01:00

spec_helper.rb

Fix merge conflicts

2019-04-23 23:38:08 +02:00