Commit Graph

11379 Commits

Author SHA1 Message Date
decabeza
a982f97cbd Adds documents list on legislation process proposals phase 2018-12-28 17:22:03 +01:00
Javier Martín
6098fb1188 Merge pull request #3134 from consul/backport-indent_private_methods
Add rubocop rule to indent private methods
2018-12-28 14:52:05 +01:00
Javi Martín
d3671491e8 Enable indentation width cop
This cop is necessary so the `Layout/IndentationConsistency` cop works
properly when its `EnforcedStyle` is set to `Rails`, and so incorrect
indentation for `private` methods is properly detected.
2018-12-28 14:00:41 +01:00
rgarcia
82a2dd622b hotfix to load categories on error 2018-12-28 09:43:08 +01:00
Julian Herrero
bf7112f090 make parameter 'skip_map' accessible on creating an investment 2018-12-27 18:39:27 +01:00
Javier Martín
f7022b36b4 Merge pull request #3132 from consul/release_0.18
Release 0.18
2018-12-27 14:37:52 +01:00
Alberto
db740df33d Merge pull request #3131 from consul/documents-title
[Backport] Documents title
2018-12-27 13:13:45 +01:00
Javi Martín
ee6ee3ca21 Update changelog for release 0.18 2018-12-27 12:29:21 +01:00
Javier Martín
d7e41fb556 Merge pull request #3127 from consul/fix_date_order_translations
Bring back date order translations
2018-12-26 16:40:03 +01:00
decabeza
4cda7d1d9f Shows documents title only if there is any document 2018-12-26 12:03:46 +01:00
Alberto
63f7c18399 Merge pull request #3123 from consul/admin-questions
[Backport] Admin poll questions index
2018-12-26 11:32:28 +01:00
Javi Martín
e34a827c48 Add translations for rails date order
Not doing so caused crashes on applications which don't fall back to
English when a translation is missing.

We're adding them in a separate file so we can exclude it from crowdin
and so translators don't translate symbols as if they were words which
need translation.
2018-12-21 19:31:15 +01:00
Javier Martín
e5cdda9d04 Merge pull request #3128 from consul/fix_valuation_with_no_budgets
Fix crash in valuation when there are no budgets
2018-12-21 19:21:51 +01:00
Javi Martín
fd681c17df Fix crash in valuation when there are no budgets 2018-12-21 17:24:34 +01:00
Javi Martín
b0f1b6245e Simplify scope usage
Rails automatically calls the `id` method inside scopes and the variable
name makes more sense if it represents investments instead of the number
of investments.
2018-12-21 17:17:35 +01:00
Javi Martín
10e8117f83 Remove unnecessary line
We were assigning the same variable twice in a row, making the first
assignment useless.
2018-12-21 17:08:27 +01:00
Alberto
c7cd6ca5ba Merge pull request #3124 from consul/honeypot-sign-up
[Backport] Honeypot on users sign up form
2018-12-21 15:51:20 +01:00
decabeza
cf7155613e Changes honeypot family name to address on users sign up form 2018-12-21 11:34:12 +01:00
decabeza
9c827d6ce0 Adds poll name on admin poll questions index 2018-12-19 21:00:09 +01:00
Alberto
d4013ee664 Merge pull request #3122 from consul/proposal-create-question
[Backport] Proposal create question
2018-12-19 19:55:24 +01:00
Julian Nicolas Herrero
82fc3f6d51 Merge pull request #3116 from consul/backport-1759-most_active_score_daily_update
[Backport] Optimize task reset_hot_score
2018-12-19 17:29:09 +01:00
Julian Nicolas Herrero
a421df31db Merge pull request #3115 from consul/backport-1758-flaky_spec_currency_symbol
[Backport] Fix flaky spec checking price without currency symbol
2018-12-19 17:27:54 +01:00
Alberto
fa19381d69 Merge pull request #3121 from consul/budget-price-explanation
[Backport] Budget investments price explanation
2018-12-19 16:47:45 +01:00
decabeza
aebd29f7e2 Adds create question button to admin proposals show 2018-12-19 16:08:57 +01:00
Julian Herrero
45353089a7 update hot_score for votes daily 2018-12-19 14:47:54 +01:00
decabeza
5a027f3a0a Removes create question button on proposals index and show 2018-12-19 13:55:00 +01:00
decabeza
7316c16edd Adds price explanation link on budget investments show 2018-12-19 13:52:17 +01:00
Raimond Garcia
d583c93ebf Merge pull request #3118 from consul/rubocop-not-to
Apply Rubocop not_to rule
2018-12-19 12:47:37 +01:00
Javier Martín
51f72ca812 Merge pull request #3113 from consul/fix_scroll
Fix scroll jump voting investments
2018-12-19 12:39:49 +01:00
Raimond Garcia
ea435ac56c Merge pull request #3112 from consul/rubocop_not_to
Add not_to Rubocop rule
2018-12-19 11:29:44 +01:00
voodoorai2000
b8cc7c5389 Apply rubocop not_to rule 2018-12-19 11:23:53 +01:00
Raimond Garcia
a8de5306c8 Merge pull request #3091 from dpgigorro/2791-homepage-for-legislation-process
add homepage for legislation processes
2018-12-19 11:14:24 +01:00
Julian Herrero
5f8558a636 optimize task reset_hot_score 2018-12-18 18:08:53 +01:00
Julian Herrero
7a690acf6c fix flaky spec
bin/rspec --seed 53044

Failures:

  1) Budget Investments Balloting Phase Confirm
     Failure/Error: expect(page).not_to have_content "#{sp3.price}"
       expected not to find text "100" in "Global Group - Global Heading You still have €999,989 to invest. Amount spent €11 Budget Investment 1006 title €10 Budget Investment 1005 title €1"
     # ./spec/features/budgets/investments_spec.rb:1466:in `block (4 levels) in <top (required)>'
     # ./spec/features/budgets/investments_spec.rb:1458:in `block (3 levels) in <top (required)>'
     # -e:1:in `<main>'

Failed examples:

rspec ./spec/features/budgets/investments_spec.rb:1419 # Budget Investments Balloting Phase Confirm
2018-12-18 17:56:32 +01:00
Javi Martín
ef9f271c89 Fix scroll jump voting budget investments
Removing the padding in the investments header nav bar means it doesn't
leave any empty space when its position changes to a fixed one.
2018-12-18 13:25:51 +01:00
Javier Martín
4782ca37d6 Merge pull request #3111 from consul/backport-customize_toda_la_ciudad
Remove custom "toda la ciudad" code
2018-12-18 13:03:51 +01:00
Julian Nicolas Herrero
2175339609 Merge pull request #3106 from consul/2918-crud_budget_groups_headings
Change CRUD for budget groups and headings
2018-12-18 10:23:24 +01:00
dperez
ff9a32c0a5 code reviewed 2018-12-15 18:04:24 +01:00
dperez
bef404c443 add homepage for legislation processes 2018-12-15 18:04:24 +01:00
voodoorai2000
c1455cb93c Add not_to Rubocop rule to Hound
https://www.rubydoc.info/gems/rubocop-rspec/1.5.0/RuboCop/Cop/RSpec/NotToNot
2018-12-15 12:41:07 +01:00
voodoorai2000
7917cea676 Change to_not for not_to
Eventhough some of us sentimentals still like the syntax `to_not` the current trend is to move to the new syntax `not_to`.

In this commit we are updating the references of expectations that used `to_not` to `not_to`.
2018-12-15 12:33:28 +01:00
Javi Martín
e6a609e6e5 Extract method to filter investments by status 2018-12-14 18:15:51 +01:00
Javi Martín
b4b0b18a2d Extract method to get investment milestone status 2018-12-14 18:15:51 +01:00
Javi Martín
91d91f2ebf Remove city heading specific code
This code accidentally made it to consul, and it's specific to Madrid.
2018-12-14 18:15:51 +01:00
Javi Martín
0de8c884ac Extract method to sort investments by heading 2018-12-14 17:26:54 +01:00
Julian Herrero
6439be44f1 change CRUD for budget groups and headings
To make it more consistent with the rest of the Admin panel,
the CRUD for budget groups and headings has been changed
from the old "all-in-one" form to a separate form for each resource.
2018-12-14 16:34:54 +01:00
Julian Herrero
8fb8f70efd cleanup (due to new CRUD for budget groups and headings) 2018-12-14 15:37:25 +01:00
Julian Herrero
25e1afea48 fix map rendering for budget headings 2018-12-14 15:37:22 +01:00
voodoorai2000
f4c402c3cb Merge remote-tracking branch 'upstream/capistrano' 2018-12-14 10:42:08 +01:00
Alberto
b701a86c1b Merge pull request #3105 from consul/draft-processes
[Backport] Draft phase on legislation processes
2018-12-13 15:53:11 +01:00