Commit Graph

12571 Commits

Author SHA1 Message Date
Javier Martín
7c61f621e2 Merge pull request #3314 from consul/backport-without_valuator
Consider having valuator group as having valuator
2019-02-19 18:59:15 +01:00
Javier Martín
44483c2c32 Merge pull request #3313 from consul/backport-fix_literal_as_condition
Fix literal as condition
2019-02-18 18:58:47 +01:00
Julian Nicolas Herrero
8156152e0f Merge pull request #3303 from consul/description_for_open_polls
[Backport] Add a description for open polls
2019-02-18 16:51:21 +01:00
Julian Nicolas Herrero
d821848add Merge pull request #3307 from consul/return_string_in_method_pluralize
[Backport] Return a String in I18n method 'pluralize'
2019-02-18 15:25:40 +01:00
Julian Herrero
884274c4ad Add a description for open polls 2019-02-18 13:34:07 +01:00
Julian Nicolas Herrero
53530ba99b Merge pull request #3287 from consul/use_double_quotes_in_specs
Change single quotes to double quotes in folder /spec
2019-02-18 13:26:49 +01:00
Javi Martín
bd67fcb9cf Consider having valuator group as having valuator
So under the tab "without valuator" we don't show investments assigned
to a valuator group, just as expected by administrators.

There was a conflict while applying this commit to the CONSUL repo. I've
decided to re-introduce the test which was deleted in commit dddf026a,
which hadn't been deleted in AyuntamientoMadrid@192f1182.
2019-02-15 21:11:24 +01:00
Javi Martín
e11b9ddccd Enable literal as condition rule in rubocop
This way deverlopers who don't run the ruby syntax check locally with
warnings enabled will be informed by HoundCI.
2019-02-15 20:21:35 +01:00
Javi Martín
250b19b0d3 Remove literal used in condition
The right syntax would have been:

`after_save :recalculate_heading_winners, if: :incompatible_changed?`

However, since the method `recalculate_heading_winners` already executes
the `if incompatible_changed?` condition, removing it keeps the intended
behaviour.
2019-02-15 20:21:35 +01:00
Javier Martín
b330de01f6 Merge pull request #3148 from matisnape/budget_investments_sorting_columns
Add sort links to admin tables
2019-02-15 19:19:11 +01:00
Javier Martín
b48a425aa9 Merge pull request #3120 from consul/backport-enable_useless_assignment_rule
Enable useless assignment rubocop rule
2019-02-15 17:31:32 +01:00
Javier Martín
264dcbe2b3 Merge pull request #3170 from rogelio-o/feature/3153
Refactor images attributes
2019-02-15 17:24:40 +01:00
Javi Martín
a69004ab95 Enable useless assignment rubocop rule
This way deverlopers who don't run the ruby syntax check locally with
warnings enabled will be informed by HoundCI.
2019-02-15 16:31:34 +01:00
Javier Martín
a0fb19f0b4 Merge branch 'master' into feature/3153 2019-02-15 16:25:50 +01:00
Raimond Garcia
caa4d2ae81 Merge pull request #3305 from consul/i18n_master
New Crowdin translations
2019-02-15 13:21:14 +01:00
decabeza
71ea9c0043 Adds missing spanish translation on admin.yml 2019-02-15 12:21:35 +01:00
Consul Bot
8a78ae0220 New translations management.yml (Spanish) 2019-02-15 12:02:07 +01:00
Consul Bot
61c938c94d New translations kaminari.yml (Spanish) 2019-02-15 12:02:06 +01:00
Consul Bot
608515ac41 New translations activerecord.yml (Spanish) 2019-02-15 12:02:05 +01:00
Consul Bot
0c83de23a7 New translations verification.yml (Spanish) 2019-02-15 12:02:02 +01:00
Consul Bot
b2cb09a03a New translations activemodel.yml (Spanish) 2019-02-15 12:02:00 +01:00
Consul Bot
371bb2a14b New translations pages.yml (Spanish) 2019-02-15 12:01:59 +01:00
Julian Herrero
366505f886 Return a String in I18n method 'pluralize'
If a translation was missing returning a Fixnum was raising an
exception 'undefined method X for Fixnum'.
2019-02-15 11:59:57 +01:00
Julian Herrero
31ac8b7f55 Change single quotes to double quotes 2019-02-15 11:40:39 +01:00
Consul Bot
fe4d02a591 New translations budgets.yml (Turkish) 2019-02-15 10:31:49 +01:00
Consul Bot
c1c5c26121 New translations moderation.yml (Turkish) 2019-02-15 10:31:47 +01:00
Consul Bot
c2aece19a7 New translations rails.yml (Turkish) 2019-02-15 10:31:46 +01:00
Consul Bot
b1c93cef3e New translations rails.yml (Turkish) 2019-02-15 10:21:28 +01:00
Consul Bot
4493bf628f New translations management.yml (Spanish) 2019-02-14 19:57:49 +01:00
Consul Bot
99fbf5f5fb New translations valuation.yml (Spanish) 2019-02-14 19:57:47 +01:00
Consul Bot
952dca56a7 New translations management.yml (Spanish) 2019-02-14 19:41:19 +01:00
Consul Bot
07e9ac5590 New translations valuation.yml (Spanish) 2019-02-14 19:41:17 +01:00
Consul Bot
44e0391fed New translations budgets.yml (Spanish) 2019-02-14 19:41:14 +01:00
Consul Bot
28877f4b52 New translations admin.yml (Spanish) 2019-02-14 19:31:02 +01:00
Consul Bot
6f6747e9c5 New translations budgets.yml (Spanish) 2019-02-14 19:30:56 +01:00
Consul Bot
a75064111b New translations general.yml (Spanish) 2019-02-14 19:20:57 +01:00
Consul Bot
8df64b23c7 New translations community.yml (Spanish) 2019-02-14 19:20:55 +01:00
Consul Bot
21765dea04 New translations activerecord.yml (Spanish) 2019-02-14 19:20:52 +01:00
Consul Bot
9292b78ae8 New translations management.yml (Spanish) 2019-02-14 19:11:14 +01:00
Consul Bot
3ddd661543 New translations general.yml (Spanish) 2019-02-14 19:11:13 +01:00
Consul Bot
cbebf995b2 New translations valuation.yml (Spanish) 2019-02-14 19:11:09 +01:00
Consul Bot
2f6b206e69 New translations pages.yml (Spanish) 2019-02-14 19:11:08 +01:00
Consul Bot
d41b17f534 New translations moderation.yml (Spanish) 2019-02-14 19:11:06 +01:00
Consul Bot
780972b315 New translations responders.yml (Spanish) 2019-02-14 19:03:52 +01:00
Consul Bot
e77e5146a4 New translations admin.yml (Spanish) 2019-02-14 18:59:31 +01:00
Consul Bot
c4ca28abab New translations admin.yml (Spanish) 2019-02-14 18:41:18 +01:00
Consul Bot
b86921fe06 New translations admin.yml (Spanish) 2019-02-14 18:31:00 +01:00
Consul Bot
fd612adc2f New translations admin.yml (Spanish) 2019-02-14 18:21:26 +01:00
Consul Bot
af0673916f New translations general.yml (Spanish) 2019-02-14 18:11:47 +01:00
Consul Bot
c7bd0a1314 New translations general.yml (Spanish) 2019-02-14 18:01:38 +01:00