Commit Graph

14976 Commits

Author SHA1 Message Date
Javi Martín
b483d50d30 Remove unused tag filter
This filter was added in commit 4285ba4b, it was changed in commit
002d8688, and most of the code from the original commit has disappeared
without a trace (maybe due to a merge conflict?).

This filter could actually be useful if we started using it when users
click on a tag. Since we don't, I'm removing it. We might add it back if
we decide to actually use it.
2020-04-08 13:49:48 +02:00
Javier Martín
54c6b413ce Merge pull request #3963 from consul/escape_xss
Apply escape_javascript security patch
2020-04-07 15:08:18 +02:00
Javier Martín
7212f6d701 Merge pull request #3788 from consul/dependabot/bundler/capybara-3.29.0
Bump capybara from 2.17.0 to 3.29.0
2020-04-06 20:34:37 +02:00
Javi Martín
fe20688d47 Update test of text with position:absolute
The following code:

```
<span class="show-for-sr">You're on page</span> 1
```

Will generate an element with `position: absolute`. When reading the
contents, it's not clear whether this element is supposed to be in the
 same paragraph or in a different one. Currently Capybara treats it as
if it were part of a different paragraph.

Since this could be the way screen readers read the text, I'm changing
the test to reflect this fact. We might change our minds in the future.
2020-04-06 20:11:44 +02:00
Javi Martín
971571b54b Simplify testing followables flash messages
Checking the whole text is tricky because the text has a `<br>` tag, and
now Capybara doesn't normalize whitespace by default anymore.

Here are a couple more options we could use:

```
expect(page).to have_content strip_tags(message.gsub(/\s*<br>\s*/,"\n"))

expect(page).to have_content strip_tags(message), normalize_ws: true
```

But then developers would wonder why we're doing all this, and would
need an extra effort to fully understand the test.

Since the tests are only checking the presence of the flash message,
checking a relevant part of the test is enough, works with any version
of Capybara, and makes the test easy to follow.
2020-04-06 20:11:44 +02:00
Javi Martín
3a15bed471 Use JavaScript driver in ballot sheet spec
With the rack driver, the `ballot_sheet.data` text was being converted
from newline characters to whitespace, while with the JavaScript driver
we get newline characters for `<br>` tags, as we expect.
2020-04-06 20:11:44 +02:00
dependabot-preview[bot]
781188758a Bump capybara from 2.17.0 to 3.29.0
Bumps [capybara](https://github.com/teamcapybara/capybara) from 2.17.0 to 3.29.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/2.17.0...3.29.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 20:11:44 +02:00
Javi Martín
03c135e5fd Apply escape_javascript security patch
This patch was included in the Rails 5.2.x series, but since we haven't
upgraded yet, we need to apply it manually.
2020-04-06 16:19:44 +02:00
Javier Martín
b53d14599e Merge pull request #3951 from consul/dependabot/bundler/json-2.3.0
[Security] Bump json from 2.1.0 to 2.3.0
2020-04-06 16:00:57 +02:00
Javier Martín
0d43d677da Merge pull request #3477 from PierreMesure/upgrade-tag-to-category
Fix a bug where a category can't be created if it already exists as a tag
2020-04-06 15:52:52 +02:00
Andy Sims
74fbde09f1 Support creates follow (Merge pull request #3895)
* Supporting a proposal will create a follow relationship
* Only followers receive notifications
2020-04-06 15:26:47 +02:00
Pierre Mesure
67911b4e35 Simplify the method and fix Rubocop warnings 2020-03-30 21:52:31 +02:00
Pierre Mesure
055ff803c6 Fix a bug where a category can't be created if it already exists as a tag (+ spec) 2020-03-30 21:41:52 +02:00
Srinandan Pai
14106ce800 Issue-1794: Allow to hide proposals created by admin (#3884) 2020-03-26 15:07:55 +01:00
dependabot-preview[bot]
73cdc60ed7 [Security] Bump json from 2.1.0 to 2.3.0
Bumps [json](https://github.com/flori/json) from 2.1.0 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/flori/json/releases)
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md)
- [Commits](https://github.com/flori/json/compare/v2.1.0...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-19 16:12:36 +00:00
Javier Martín
a8fe6b8627 Merge pull request #3943 from consul/dependabot/bundler/user_agent_parser-2.6.0
[Security] Bump user_agent_parser from 2.4.1 to 2.6.0
2020-03-10 20:21:33 +01:00
dependabot-preview[bot]
2fccacfb10 [Security] Bump user_agent_parser from 2.4.1 to 2.6.0
Bumps [user_agent_parser](https://github.com/ua-parser/uap-ruby) from 2.4.1 to 2.6.0. **This update includes a security fix.**
- [Release notes](https://github.com/ua-parser/uap-ruby/releases)
- [Commits](https://github.com/ua-parser/uap-ruby/compare/v2.4.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-10 19:48:29 +01:00
Javier Martín
448b8ce4c5 Merge pull request #3867 from consul/release_1.1.0
Release version 1.1.0
2020-03-10 19:12:40 +01:00
Javi Martín
90915cc95c Release version 1.1.0 2020-03-10 18:44:40 +01:00
Javier Martín
e68316fc85 Merge pull request #3942 from rockandror/i18n_crowdin
Update translations from Crowdin
2020-03-10 18:44:24 +01:00
Javier Martín
47f20c2dca Merge pull request #3941 from rockandror/fix-wrong-translation
Fix English text written in Spanish
2020-03-10 18:08:16 +01:00
Senén Rodero Rodríguez
37dbe1ca42 Update translations from Crowdin 2020-03-10 16:50:52 +01:00
Senén Rodero Rodríguez
11f778b09f Change translation language 2020-03-10 15:48:45 +01:00
Javier Martín
2580523ec1 Merge pull request #3938 from consul/deploy_branch
Allow deploying a specific branch to production
2020-03-10 12:38:49 +01:00
Julian Herrero
1b683ad0da Allow deploying a specific branch to production
We could also use the deploy-secrets file; here we use `ENV["branch"]`
for consistency with other environments.
2020-03-09 13:16:47 +01:00
Javier Martín
0b33768ed1 Merge pull request #3934 from consul/dependabot/bundler/puma-4.3.3
[Security] Bump puma from 4.3.1 to 4.3.3
2020-03-04 13:55:26 +01:00
dependabot-preview[bot]
41777c93e6 [Security] Bump puma from 4.3.1 to 4.3.3
Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.3. **This update includes security fixes.**
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-01 22:55:54 +00:00
Javier Martín
1e94a7c71a Merge pull request #3931 from consul/bundler_version
Specify which bundler version to install
2020-02-27 18:08:10 +01:00
Javi Martín
e1e2329189 Specify which bundler version to install
We're now using the same version we used to generate our Gemfile.lock.

Using the latest bundler we got a deprecation warning, which might turn
into an error in the future:

[DEPRECATED] The `--deployment` flag is deprecated because it relies on
being remembered across bundler invocations, which bundler will no
longer do in future versions.

We could also upgrade to bundler 2.x, but since we're using Ruby 2.4 and
Ruby 2.6 comes with bundler 1.17, we've decided to keep this version.
2020-02-27 17:33:21 +01:00
Javier Martín
1d0cfdde32 Merge pull request #3929 from consul/fix_unselecting_spec
Fix flaky spec when unselecting an investment
2020-02-26 17:57:23 +01:00
Javier Martín
9d750dd399 Merge pull request #3917 from rockandror/improve-remote-translations
Improve remote translations
2020-02-26 17:29:14 +01:00
Javi Martín
25bc4f1103 Fix flaky unselecting an investment spec
In this spec, we were doing to request at the same time; one to unselect
an investment and another one to filter the investments. If the second
request finished before the first one, the test failed.

Adding an expectation to check the first request has finished before the
second one starts solves the problem.
2020-02-26 17:22:56 +01:00
taitus
c5c771f011 Improve specs texts 2020-02-26 16:47:13 +01:00
taitus
2f500a6b56 Fix detect_remote_translations for Legislation::Proposal
Legislation::Proposal is not Globalize model but use CommentableActions and try
detect remote translations. Add new condition to discard Non Globalize models.
This fix is necessary since the following commit was included: c1f3a4ad.
2020-02-26 16:47:13 +01:00
taitus
d853366d38 Add RemoteTranslation validations
- Validate that locale is a valid locale for RemoteTranslation Client.
- RemoteTranslation can only be created for resources that do not have the requested
language translated
2020-02-26 16:47:13 +01:00
taitus
086e38c969 Improve display remote translation button
- Do not display remote translations button when API key is not configured
2020-02-26 12:30:17 +01:00
Javier Martín
6b9b531776 Merge pull request #3927 from consul/dependabot/bundler/nokogiri-1.10.8
[Security] Bump nokogiri from 1.10.7 to 1.10.8
2020-02-25 12:19:56 +01:00
dependabot-preview[bot]
2b0450ef4f [Security] Bump nokogiri from 1.10.7 to 1.10.8
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-24 19:43:53 +00:00
Javier Martín
5f17718951 Merge pull request #3926 from consul/admin_menu
Fix hidden active elements in admin menu
2020-02-21 13:02:20 +01:00
Javi Martín
651861c462 Fix hidden active elements in admin menu
In the admin menu, some links take you to a section, and some links open
a submenu with more links.

When we disable the "multi-open" property of the menu and the active
element is a link which takes you to a section, Foundation will hide it
whenever we click a link which opens a submenu.

The easiest solution is to enable "multi-open" property.
2020-02-20 18:30:39 +01:00
Javier Martín
404cd797bd Merge pull request #3924 from PierreMesure/remove-fallbacks-true
Remove fallbacks = true from staging, preprod and prod
2020-02-20 15:13:32 +01:00
Pierre Mesure
40ecbe0348 Remove fallbacks = true from staging, preprod and prod 2020-02-20 11:09:55 +01:00
Javier Martín
98a2a5b178 Merge pull request #3922 from rockandror/add-locales-to-datepicker
Add locales to datepicker
2020-02-19 19:41:01 +01:00
Javier Martín
14b1f1b4d3 Merge pull request #3911 from rockandror/dashboard-email
Improve Dashboard emails
2020-02-19 19:06:53 +01:00
taitus
4bb194e1cc Recover rake "settings:rename_setting_keys"
We need to add :rename_setting_keys before :add_new_settings task.
This way the value of the old key will not be lost.
2020-02-19 16:14:44 +01:00
taitus
162462fc32 Use en-GB locale when current locale is not include in application.js
When a current locale is not defined on applicaton.js, datepicker load
the last jquery-ui/i18n/datepicker-xx defined.
Add 'jquery-ui/i18n/datepicker-en-GB' as last "require" to use when a current locale is not defined.
2020-02-19 15:58:55 +01:00
taitus
11cdcb72ef Add the rest of the languages available in "available_locales"
Of all the available locales on application.rb, the only ones that do not
have a correspondence with:
https://github.com/jquery/jquery-ui/tree/master/ui/i18n are [:so, :val]
2020-02-18 17:57:21 +01:00
Alceu Medeiros
6c3509fbf5 Add datepicker translations to available locales 2020-02-18 17:42:46 +01:00
Javier Martín
36eb2f8eda Merge pull request #3921 from edumoreira1506/fix/card-description
Fix card description overflow
2020-02-18 14:47:45 +01:00
Julian Nicolas Herrero
377c24f49b Merge pull request #3063 from microweb10/poll_question_answer_update_spec
Check for missing feature specs for Poll::Question::Answer
2020-02-18 19:38:49 +07:00