Commit Graph

11202 Commits

Author SHA1 Message Date
voodoorai2000
8cfcc7e693 Use master as the default deploy branch
It's a good practice to use a stable branch for deployments, but not all forks have this branch configured

Using master as the default branch for now
2018-09-21 15:32:41 +02:00
voodoorai2000
bebcc3da48 Skip ruby and bundler installations
Ruby and bundler should already be installed in the system

Before we can bring back these commands we need to review them, right now they are raising an interesting exception
2018-09-21 15:31:40 +02:00
voodoorai2000
335cd2b597 Link unicorn and production.rb to capistrano's shared folder 2018-09-21 15:29:57 +02:00
Alberto
e0d08a32dd Merge pull request #2916 from consul/custom-fonts
[Backport] Custom fonts
2018-09-21 14:29:50 +02:00
decabeza
a94591fe78 Loads custom fonts before default ones
Also includes a .keep file inside fonts/custom folder to track the directory by git
2018-09-21 13:46:50 +02:00
Alberto
6257d546b5 Merge pull request #2915 from consul/comments-processes
[Backport] Changes allegations dates label
2018-09-21 12:59:01 +02:00
decabeza
a1bbc82c8d Changes allegations dates label 2018-09-20 17:33:04 +02:00
Julian Herrero
673ec075eb Make answers translatable 2018-09-20 17:13:40 +02:00
Julian Herrero
5e6248d2ac Make questions translatable 2018-09-20 17:11:53 +02:00
Julian Herrero
9495208518 Make polls translatable 2018-09-20 17:07:43 +02:00
Papaya Labs
981281591e Show active tab in custom info texts 2018-09-19 13:20:10 -05:00
Javi Martín
4d238c5d07 Fix crash updating legislation process categories
We were expecting translation parameters in legislation processes
`update` action. However, those parameters aren't sent when we get to
that action through the "proposals" tab.
2018-09-19 14:54:52 +02:00
Javi Martín
58ad333791 Remove duplicate lines 2018-09-19 14:54:52 +02:00
Javi Martín
3fb98b1752 Fix typos 2018-09-19 14:54:52 +02:00
Javi Martín
a0f1a9ec1b Be consistent checking changes in draft versions
There's no reason to only convert Markdown to HTML in translations when
their body changes but to always convert it when the "main" body field
changes.

Whether we should always use the condition or never use it is something
we can debate about, though.
2018-09-19 14:54:24 +02:00
Javi Martín
cc6da6be28 Fix inputs in legislation process translations
They were accidentally changed from `text_area` to `text_field` when
making them translatable.
2018-09-19 14:54:24 +02:00
Marko Lovic
64d72ca8e7 Enable JS in shared translatable test
Due to its markdown editor, the admin draft version page
requires JS to correctly render the draft version form.
2018-09-19 14:54:24 +02:00
Marko Lovic
05bfa193cd Make Legislation Draft Versions translatable 2018-09-19 14:54:24 +02:00
Marko Lovic
06347062dd Make Legislation Questions translatable 2018-09-19 14:54:24 +02:00
Marko Lovic
d78aea1fd3 Make Legistlation Processes translatable 2018-09-19 14:54:24 +02:00
Marko Lovic
ee15295f54 Add migration for all collaborative legislation translations 2018-09-19 14:54:24 +02:00
Javi Martín
86aa56b5e8 Fix flaky legislation processes specs
They were failing if executed right before midnight. If the process is
created right before midnight and then the date changes, when we visit
the process path the phase will aready be open.
2018-09-19 14:24:09 +02:00
Javi Martín
c1bb1fb2e1 Fix flaky admin notifications spec
It was failing when executed right before midnight due to the date
changing between the moment the notification is created and the moment
the test checks the notification shows the current date.
2018-09-19 14:21:47 +02:00
Javi Martín
d7b9ed1bc4 Use dynamic times and dates in factories (part 2)
Most factories were using dynamic times and dates since commit 0cf799a.
However:

* At the time, commits AyuntamientoMadrid/consul@71f5351 and
AyuntamientoMadrid/consul@a476a30 (which introduced static times/dates
in factories) hadn't been backported.
* The changes in commit 0cf799a overlooked the factory
`proposal_notification`.
2018-09-19 14:21:21 +02:00
Raimond Garcia
c1d705ff30 Merge pull request #2910 from consul/backport-make-admin-notifications-translatable
[Backport] Make admin notifications translatable
2018-09-19 14:13:40 +02:00
Javi Martín
ec3d4c4449 Fix flaky officing dashboard spec
It was failing when executed right before midnight due to today's
officer assigments changing during the test.
2018-09-19 14:12:32 +02:00
Javi Martín
b787e33883 Use the same system to freeze time in all specs
This required changing the `voted_before_sign_in` slightly in order to
change what the method returns if the user signed in and voted at the
exact same microsecond.

It doesn't affect production code because it would be impossible for the
user to do both things at the same time.

As a side effect, the method now returns what the method name suggests.
Before this change, the correct method name would have been
`voted_before_or_at_the_same_time_of_sign_in`.

As a less desirable side effect, in the tests now we need to make sure
at least one second passes between the moment a user votes and the
moment a user signs in again. One microsecond wouldn't work because
the method `travel_to` automatically sets microseconds to zero in order
to avoid rounding issues.
2018-09-19 14:11:50 +02:00
Javi Martín
02b8bc6f69 Simplify the way to freeze time in specs 2018-09-19 14:10:18 +02:00
Marko Lovic
0731b137cf Add both English and Spanish translations to Admin Notification seeds 2018-09-19 12:15:45 +02:00
Marko Lovic
3be3b7342c Reinstate deleted translations for seed Admin Notifications
These were removed in 5c726e0, seemingly by mistake. The change
doesn't make sense in the context of the commit, and it breaks
the seed data.
2018-09-19 12:15:40 +02:00
Marko Lovic
f6749049c9 Make Admin Notifications translatable 2018-09-19 12:15:26 +02:00
Marko Lovic
5ff85d33d6 Fix submit button text for Admin Notifications admin form
In Madrid, the button text didn't change depending on whether the form
is for the "new" page or for the "edit" page.

In consul, the buttons texts were "create admin notification" and
"update admin notification" instead of "create notification" and "update
notification".

Also change translation key from "submit" to "submit_button" to
match other instances.
2018-09-19 12:05:18 +02:00
dependabot[bot]
de894cb917 Bump paranoia from 2.4.0 to 2.4.1
Bumps [paranoia](https://github.com/rubysherpas/paranoia) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/rubysherpas/paranoia/releases)
- [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md)
- [Commits](https://github.com/rubysherpas/paranoia/compare/v2.4.0...v2.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-19 06:57:10 +00:00
dependabot[bot]
77127cd226 Bump ancestry from 3.0.1 to 3.0.2
Bumps [ancestry](https://github.com/stefankroes/ancestry) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/stefankroes/ancestry/releases)
- [Changelog](https://github.com/stefankroes/ancestry/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefankroes/ancestry/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-19 06:56:26 +00:00
Papaya Labs
f7c10de627 Fix indentation and include specs 2018-09-18 15:16:31 -05:00
María Checa
eeb7463ff4 Merge pull request #2860 from consul/backport_1582-icon-polls
[Backport] Adds status icons on polls poll group
2018-09-18 12:42:37 +02:00
dependabot[bot]
652c414218 Bump coveralls from 0.8.21 to 0.8.22
Bumps [coveralls](https://coveralls.io) from 0.8.21 to 0.8.22.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-18 05:22:23 +00:00
Raimond Garcia
71a537b4db Merge pull request #2903 from consul/backport-refactor-translatable-specs
[Backport] Refactor translatable specs
2018-09-17 23:05:06 +02:00
Raimond Garcia
ea72cd058b Merge pull request #2876 from javierm/ckeditor4_update
Ckeditor4 update
2018-09-17 23:02:50 +02:00
Javi Martín
0552616764 Use have_field to detect text input contents
Using `have_content` detected textareas, but not text input contents.

All credit to Marko (mlovic) for finding the issue and suggesting the
implemented solution.
2018-09-17 20:34:43 +02:00
Javi Martín
612fdb09dd Share translatable specs 2018-09-17 20:34:43 +02:00
Javi Martín
726110c91e Share Globalize JavaScript interface specs 2018-09-17 20:34:20 +02:00
Javi Martín
a64a290392 Extract commentable_path to an initializer
By doing so and including it in ActionDispatch::Routing::UrlFor, we make
it available in controllers, helpers and specs, and so we can remove the
duplication we had there with methods dealing with the same problem.

Even if monkey-patching is ugly, using a different module and executing
ActionDispatch::Routing::UrlFor.send(:include, MyModule) wouldn't make
the method available in the controller.
2018-09-17 20:28:55 +02:00
dependabot[bot]
641421959e Bump savon from 2.11.2 to 2.12.0
Bumps [savon](https://github.com/savonrb/savon) from 2.11.2 to 2.12.0.
- [Release notes](https://github.com/savonrb/savon/releases)
- [Changelog](https://github.com/savonrb/savon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/savonrb/savon/compare/v2.11.2...v2.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-17 17:15:34 +00:00
Raimond Garcia
b49b3ade68 Merge pull request #2881 from consul/dependabot/bundler/autoprefixer-rails-9.1.4
Bump autoprefixer-rails from 8.2.0 to 9.1.4
2018-09-17 19:09:20 +02:00
Raimond Garcia
34589443e3 Merge pull request #2884 from consul/dependabot/bundler/capistrano-rails-1.4.0
Bump capistrano-rails from 1.3.1 to 1.4.0
2018-09-17 19:08:58 +02:00
Raimond Garcia
14edf4b603 Merge pull request #2892 from consul/dependabot/bundler/mdl-0.5.0
Bump mdl from 0.4.0 to 0.5.0
2018-09-17 19:08:22 +02:00
Raimond Garcia
5aa84c139e Merge pull request #2894 from consul/dependabot/bundler/unicorn-5.4.1
Bump unicorn from 5.4.0 to 5.4.1
2018-09-17 19:08:04 +02:00
Raimond Garcia
a160a9e694 Merge pull request #2895 from consul/dependabot/bundler/scss_lint-0.55.0
Bump scss_lint from 0.54.0 to 0.55.0
2018-09-17 19:07:39 +02:00
Raimond Garcia
cae210c155 Merge pull request #2887 from wairbut-m2c/backport/db_queries
[Backport] Replace `.all.each` with `.find_each` to reduce memory usage
2018-09-17 19:06:46 +02:00