Commit Graph

9997 Commits

Author SHA1 Message Date
decabeza
a03c13aa22 Updates executions texts 2018-11-06 13:02:34 +01:00
decabeza
eb76f644b7 Adds link to heading name on sidebar 2018-11-06 13:02:34 +01:00
decabeza
c7936bacae Adds styles to budgets execution 2018-11-06 13:02:34 +01:00
Angel Perez
2a3ce0b182 Render winner investments under 'Executions' tab 2018-11-06 13:02:34 +01:00
Angel Perez
5de74ea6f1 Load budget headings on budgets/executions#show action 2018-11-06 13:02:34 +01:00
Angel Perez
0a95abc30d Replace budget execution heading route with anchor link 2018-11-06 13:02:34 +01:00
Angel Perez
6559c7212b Add prompt & label for milestones filters under budgets/executions#show 2018-11-06 13:02:34 +01:00
Javi Martín
4f878180e5 Move creation of milestone statuses seeds
So it's in the same lines as in Madrid's repository.
2018-11-06 13:02:30 +01:00
Angel Perez
97809db1b7 Enable filtering of investments by their milestones statuses 2018-11-05 18:04:38 +01:00
Angel Perez
3574bf867c Add default image for investments without picture 2018-11-05 18:04:38 +01:00
Angel Perez
3e6cbc9505 Add basic frontend for budget executions list 2018-11-05 18:04:38 +01:00
Angel Perez
b483ca7f7e Add 'Execution' tab to a finished Budget
This new tab will show all winner investments projects with milestones
2018-11-05 16:33:32 +01:00
Raimond Garcia
6b246552e3 Merge pull request #2901 from consul/dependabot/bundler/cancancan-2.3.0
Bump cancancan from 2.1.2 to 2.3.0
2018-11-05 12:41:22 +01:00
Raimond Garcia
7e3583f12a Merge pull request #2923 from consul/dependabot/bundler/rollbar-2.18.0
Bump rollbar from 2.15.5 to 2.18.0
2018-11-05 12:40:51 +01:00
Raimond Garcia
92c323aea1 Merge pull request #2957 from consul/dependabot/bundler/letter_opener_web-1.3.4
Bump letter_opener_web from 1.3.2 to 1.3.4
2018-11-05 12:39:41 +01:00
Raimond Garcia
d3430b5322 Merge pull request #2991 from consul/dependabot/bundler/loofah-2.2.3
[Security] Bump loofah from 2.2.2 to 2.2.3
2018-11-05 12:38:18 +01:00
voodoorai2000
3b6cfa29e5 Add one more PR to Changelog 2018-10-31 18:01:57 +01:00
Raimond Garcia
8fb0ed7236 Merge pull request #2996 from consul/release-0.17
Release v0.17
2018-10-31 17:32:35 +01:00
voodoorai2000
a303a60f65 Update version number for consul.json 2018-10-31 16:40:34 +01:00
Alberto
d1e40adcbc Merge pull request #2994 from consul/social-meta-tags
[Backport] Social meta tags
2018-10-31 15:01:19 +01:00
Alberto
08f6279678 Merge pull request #2993 from consul/clean-format
[Backport] Code format
2018-10-31 15:01:01 +01:00
decabeza
884580206a Fixes houndci-bot warnings 2018-10-31 14:22:10 +01:00
decabeza
747aec3506 Improves some code format details 2018-10-31 14:22:10 +01:00
voodoorai2000
56f1ae2009 Add Changelog for release 0.17 2018-10-31 13:40:42 +01:00
Javier Martín
d78b1c1998 Merge pull request #2995 from consul/backport-1618-fix_flaky_draft_versions_spec
Fix flaky spec: Admin legislation draft versions Update Valid legislation draft version
2018-10-31 13:12:17 +01:00
Javi Martín
5345b563e9 Don't check already present page content
The content 'An example legislation process' is already present before
we click the "All" link.

Not checking the page content properly sometimes resulted in the second
click being executed before the first request had been completed, making
the spec fail.

By checking the "All" link isn't present anymore, we guarantee the
request has been completed before trying to click the 'An example
legislation process' link.
2018-10-31 12:34:47 +01:00
Javier Martín
6c21766511 Merge pull request #2992 from consul/backport-cleanup_newsletter
Newsletter updates
2018-10-31 11:52:08 +01:00
decabeza
cd7bff04b4 Refactors social meta tags spec 2018-10-31 11:51:44 +01:00
decabeza
ab70872a7d Adds new social share partial for proposals 2018-10-31 11:42:00 +01:00
voodoorai2000
42d4fd880f Increase delayed jobs max run time 2018-10-30 17:11:13 +01:00
voodoorai2000
7d5b57aee2 Add counter of emails sent to newsletter preview 2018-10-30 17:07:31 +01:00
dependabot[bot]
d9711d592a [Security] Bump loofah from 2.2.2 to 2.2.3
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 13:41:05 +00:00
Javier Martín
bc77812ae8 Merge pull request #2990 from consul/backport-remove_described_class_cop
Remove described class cop
2018-10-29 14:38:43 +01:00
Javier Martín
65dc4b2ea3 Merge pull request #2989 from consul/backport-2734_consul_related-fix_flaky_comments_spec
Fix flaky specs: proposals and legislation Voting comments Update
2018-10-29 14:16:39 +01:00
Javier Martín
c0b8bd98db Merge pull request #2987 from consul/houndci_basic
Add Hound basic configuration
2018-10-29 14:06:43 +01:00
Javi Martín
4cbe81a142 Remove described class cop
We've agreed `User.new` is easier to read than `described_class.new` and
since we are ignoring Hound's comments regarding this topic, we might as
well remove it.
2018-10-29 13:58:00 +01:00
Javi Martín
74927f4ed6 Make Capybara check the page between comment votes
As pointed out in PR consul#2734:

"After clicking the first link, there's an AJAX request which replaces
the existing `.in-favor a` and `.against a` links with new elements. So
if Capybara tries to click the existing `.against a` link at the same
moment it's being replaced, clicking the link won't generate a new
request".

Making Capybara check the page for new content before clicking the
second link solves the problem.

This commit solves issues afecting both Madrid's fork and the original
CONSUL repo.
2018-10-29 11:15:03 +01:00
Javier Martín
e7f05a5711 Merge pull request #2986 from consul/backport-migrate_globalize_data
Migrate globalize data
2018-10-26 12:23:53 +02:00
Javier Martín
f987383c14 Merge pull request #2985 from consul/backport-2875-translatable_bugs
Fix translatable bugs
2018-10-26 12:23:19 +02:00
Javi Martín
7794690b8c Enable SCSS rules in Hound 2018-10-26 12:13:06 +02:00
Javi Martín
4048d17203 Add basic rubocop configuraton for Hound
This way we can ask contributors to follow some basic guidelines like
removing trailing whitespaces while not overwhelming them with all our
rules.
2018-10-26 11:46:17 +02:00
Javi Martín
48140f74e9 Remove rubocop_todo file
No developers are maintaining it anymore.
2018-10-26 11:46:10 +02:00
Javi Martín
9404cb8b3a Fix bug with non-underscored locales
Ruby can't have hyphens in method names, so sending something like
`record.title_pt-BR` would raise an exception.

Using globalize's `localized_attr_name_for` method fixes the bug.

Thanks Marko for the tip.
2018-10-23 16:29:14 +02:00
Javi Martín
934bce5932 Don't abort the migration if the simulation fails
We think aborting the migration will generate more headaches to system
administrators, who will have to manually check and fix every invalid
record before anything can be migrated.
2018-10-23 16:29:14 +02:00
Javi Martín
7fff57a25f Add task to simulate data migration
This way we can check everything is OK before actually migrating the
data to the translations tables.
2018-10-23 16:29:14 +02:00
Javi Martín
3c48059f07 Log failed data migrations
In theory, it should never happen, but that's why exceptions exist.
2018-10-23 16:29:13 +02:00
Javi Martín
be25e5fc45 Use migrate_data option for globalize
This way the task to migrate the data doesn't have to be run manually if
these migrations weren't already executed.
2018-10-23 16:29:13 +02:00
Javi Martín
a84a0f2b7d Migrate custom pages data to their locale 2018-10-23 16:29:13 +02:00
Javi Martín
ef7be4fc55 Add task to migrate data to translation tables
We forgot to do it when we created the translation tables, and so now we
need to make sure we don't overwrite existing translations.
2018-10-23 16:29:13 +02:00
Javi Martín
ccdbdb26ba Fix poll question with non-underscored locales
Ruby can't have hyphens in method names, so sending something like
`title_pt-BR=` would raise an exception.
2018-10-23 14:23:10 +02:00