]> git.openstreetmap.org Git - rails.git/log
rails.git
4 years agoPrefer keyword arguments when method has optional boolean arguments
Andy Allan [Wed, 11 Nov 2020 16:14:24 +0000 (16:14 +0000)]
Prefer keyword arguments when method has optional boolean arguments

4 years agoPrefer keyword arguments when method has optional boolean arguments
Andy Allan [Wed, 11 Nov 2020 15:51:44 +0000 (15:51 +0000)]
Prefer keyword arguments when method has optional boolean arguments

4 years agoMerge remote-tracking branch 'upstream/pull/2954' into master
Tom Hughes [Wed, 11 Nov 2020 12:24:27 +0000 (12:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2954' into master

4 years agoFix missing html layout for user_mailer emails
Andy Allan [Wed, 11 Nov 2020 11:19:20 +0000 (11:19 +0000)]
Fix missing html layout for user_mailer emails

This was caused by renaming the mailer without renaming the layout. Added a test to cover this in future.

Fixes #2903

4 years agoMerge remote-tracking branch 'upstream/pull/2953' into master
Tom Hughes [Wed, 11 Nov 2020 08:21:49 +0000 (08:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2953' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2952' into master
Tom Hughes [Wed, 11 Nov 2020 08:21:47 +0000 (08:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2952' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2951' into master
Tom Hughes [Wed, 11 Nov 2020 08:21:45 +0000 (08:21 +0000)]
Merge remote-tracking branch 'upstream/pull/2951' into master

4 years agoBump autoprefixer-rails from 10.0.1.3 to 10.0.2.0
dependabot[bot] [Wed, 11 Nov 2020 05:03:13 +0000 (05:03 +0000)]
Bump autoprefixer-rails from 10.0.1.3 to 10.0.2.0

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.1.3 to 10.0.2.0.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/10.0.1.3...10.0.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump bootsnap from 1.5.0 to 1.5.1
dependabot[bot] [Wed, 11 Nov 2020 05:02:37 +0000 (05:02 +0000)]
Bump bootsnap from 1.5.0 to 1.5.1

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.5.0...v1.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aws-sdk-s3 from 1.84.0 to 1.84.1
dependabot[bot] [Wed, 11 Nov 2020 05:01:33 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.84.0 to 1.84.1

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.84.0 to 1.84.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2947' into master
Tom Hughes [Tue, 10 Nov 2020 09:42:26 +0000 (09:42 +0000)]
Merge remote-tracking branch 'upstream/pull/2947' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2950' into master
Tom Hughes [Tue, 10 Nov 2020 09:39:49 +0000 (09:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2950' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2949' into master
Tom Hughes [Tue, 10 Nov 2020 09:39:46 +0000 (09:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2949' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2948' into master
Tom Hughes [Tue, 10 Nov 2020 09:39:44 +0000 (09:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2948' into master

4 years agoAdd yarn to Ubuntu install instructions
Tom Hughes [Tue, 10 Nov 2020 09:38:53 +0000 (09:38 +0000)]
Add yarn to Ubuntu install instructions

4 years agoBump webmock from 3.9.4 to 3.9.5
dependabot[bot] [Tue, 10 Nov 2020 05:03:15 +0000 (05:03 +0000)]
Bump webmock from 3.9.4 to 3.9.5

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.4 to 3.9.5.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.4...v3.9.5)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aws-sdk-s3 from 1.83.2 to 1.84.0
dependabot[bot] [Tue, 10 Nov 2020 05:02:16 +0000 (05:02 +0000)]
Bump aws-sdk-s3 from 1.83.2 to 1.84.0

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.2 to 1.84.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump listen from 3.2.1 to 3.3.0
dependabot[bot] [Tue, 10 Nov 2020 05:01:33 +0000 (05:01 +0000)]
Bump listen from 3.2.1 to 3.3.0

Bumps [listen](https://github.com/guard/listen) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoUpdate to iD v2.19.5
Quincy Morgan [Mon, 9 Nov 2020 20:12:21 +0000 (15:12 -0500)]
Update to iD v2.19.5

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Nov 2020 11:47:12 +0000 (12:47 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2944' into master
Tom Hughes [Mon, 9 Nov 2020 08:11:28 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2944' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2943' into master
Tom Hughes [Mon, 9 Nov 2020 08:11:25 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2943' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2942' into master
Tom Hughes [Mon, 9 Nov 2020 08:11:23 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2942' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2941' into master
Tom Hughes [Mon, 9 Nov 2020 08:11:19 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2941' into master

4 years agoBump mini_magick from 4.10.1 to 4.11.0
dependabot[bot] [Mon, 9 Nov 2020 05:03:31 +0000 (05:03 +0000)]
Bump mini_magick from 4.10.1 to 4.11.0

Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.10.1 to 4.11.0.
- [Release notes](https://github.com/minimagick/minimagick/releases)
- [Commits](https://github.com/minimagick/minimagick/compare/v4.10.1...v4.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump eslint from 7.12.1 to 7.13.0
dependabot[bot] [Mon, 9 Nov 2020 05:02:12 +0000 (05:02 +0000)]
Bump eslint from 7.12.1 to 7.13.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.12.1 to 7.13.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.12.1...v7.13.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump aws-sdk-s3 from 1.83.1 to 1.83.2
dependabot[bot] [Mon, 9 Nov 2020 05:01:44 +0000 (05:01 +0000)]
Bump aws-sdk-s3 from 1.83.1 to 1.83.2

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.1 to 1.83.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump bootstrap from 4.5.2 to 4.5.3
dependabot[bot] [Mon, 9 Nov 2020 05:01:17 +0000 (05:01 +0000)]
Bump bootstrap from 4.5.2 to 4.5.3

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.5.2...v4.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2939' into master
Tom Hughes [Fri, 6 Nov 2020 08:17:13 +0000 (08:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2939' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2938' into master
Tom Hughes [Fri, 6 Nov 2020 08:17:10 +0000 (08:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2938' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2937' into master
Tom Hughes [Fri, 6 Nov 2020 08:17:06 +0000 (08:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2937' into master

4 years agoBump webmock from 3.9.3 to 3.9.4
dependabot[bot] [Fri, 6 Nov 2020 05:03:53 +0000 (05:03 +0000)]
Bump webmock from 3.9.3 to 3.9.4

Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.3 to 3.9.4.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.3...v3.9.4)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump better_errors from 2.9.0 to 2.9.1
dependabot[bot] [Fri, 6 Nov 2020 05:02:42 +0000 (05:02 +0000)]
Bump better_errors from 2.9.0 to 2.9.1

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.9.0...v2.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump libxml-ruby from 3.2.0 to 3.2.1
dependabot[bot] [Fri, 6 Nov 2020 05:01:33 +0000 (05:01 +0000)]
Bump libxml-ruby from 3.2.0 to 3.2.1

Bumps [libxml-ruby](https://github.com/xml4r/libxml-ruby) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/xml4r/libxml-ruby/releases)
- [Changelog](https://github.com/xml4r/libxml-ruby/blob/master/HISTORY)
- [Commits](https://github.com/xml4r/libxml-ruby/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2935' into master
Tom Hughes [Thu, 5 Nov 2020 12:40:50 +0000 (12:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2935' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2934' into master
Tom Hughes [Thu, 5 Nov 2020 12:40:46 +0000 (12:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2934' into master

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Nov 2020 12:28:49 +0000 (13:28 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoBump autoprefixer-rails from 10.0.1.2 to 10.0.1.3
dependabot[bot] [Thu, 5 Nov 2020 05:02:10 +0000 (05:02 +0000)]
Bump autoprefixer-rails from 10.0.1.2 to 10.0.1.3

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.1.2 to 10.0.1.3.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/10.0.1.2...10.0.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump better_errors from 2.8.3 to 2.9.0
dependabot[bot] [Thu, 5 Nov 2020 05:00:57 +0000 (05:00 +0000)]
Bump better_errors from 2.8.3 to 2.9.0

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.3 to 2.9.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.3...v2.9.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2931' into master
Tom Hughes [Tue, 3 Nov 2020 19:19:28 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/2931' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2933' into master
Tom Hughes [Tue, 3 Nov 2020 19:19:13 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/2933' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2932' into master
Tom Hughes [Tue, 3 Nov 2020 19:19:11 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/2932' into master

4 years agoBump bootsnap from 1.4.9 to 1.5.0
dependabot[bot] [Tue, 3 Nov 2020 05:02:39 +0000 (05:02 +0000)]
Bump bootsnap from 1.4.9 to 1.5.0

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.9 to 1.5.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.9...v1.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump autoprefixer-rails from 10.0.1.1 to 10.0.1.2
dependabot[bot] [Tue, 3 Nov 2020 05:01:27 +0000 (05:01 +0000)]
Bump autoprefixer-rails from 10.0.1.1 to 10.0.1.2

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.1.1 to 10.0.1.2.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/10.0.1.1...10.0.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoUpdate to iD v2.19.4
Quincy Morgan [Mon, 2 Nov 2020 15:27:31 +0000 (10:27 -0500)]
Update to iD v2.19.4

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Nov 2020 11:51:54 +0000 (12:51 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2929' into master
Tom Hughes [Mon, 2 Nov 2020 08:25:20 +0000 (08:25 +0000)]
Merge remote-tracking branch 'upstream/pull/2929' into master

4 years agoBump autoprefixer-rails from 10.0.1.0 to 10.0.1.1
dependabot[bot] [Mon, 2 Nov 2020 05:02:01 +0000 (05:02 +0000)]
Bump autoprefixer-rails from 10.0.1.0 to 10.0.1.1

Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 10.0.1.0 to 10.0.1.1.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/10.0.1.0...10.0.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge remote-tracking branch 'upstream/pull/2923' into master
Tom Hughes [Sun, 1 Nov 2020 14:49:35 +0000 (14:49 +0000)]
Merge remote-tracking branch 'upstream/pull/2923' into master

4 years agoAllow redirects to authentication services from the settings page
Tom Hughes [Thu, 29 Oct 2020 21:25:47 +0000 (21:25 +0000)]
Allow redirects to authentication services from the settings page

Chrome and Safari require redirects to match the form-action rule
as well as the original submission address.

4 years agoUpdate to iD v2.19.3
Quincy Morgan [Thu, 29 Oct 2020 19:12:49 +0000 (15:12 -0400)]
Update to iD v2.19.3

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Oct 2020 12:26:26 +0000 (13:26 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoChanged Ubuntu 18.04 to 20.04 and Ruby 2.5 to 2.7
nlaratta [Wed, 28 Oct 2020 17:37:48 +0000 (11:37 -0600)]
Changed Ubuntu 18.04 to 20.04 and Ruby 2.5 to 2.7

Fixes #2909
Closes #2922

4 years agoMerge remote-tracking branch 'upstream/pull/2920' into master
Tom Hughes [Wed, 28 Oct 2020 15:56:59 +0000 (15:56 +0000)]
Merge remote-tracking branch 'upstream/pull/2920' into master

4 years agoUpdate to iD v2.19.2
Quincy Morgan [Wed, 28 Oct 2020 14:58:57 +0000 (10:58 -0400)]
Update to iD v2.19.2

4 years agoMerge remote-tracking branch 'upstream/pull/2919' into master
Tom Hughes [Wed, 28 Oct 2020 14:07:55 +0000 (14:07 +0000)]
Merge remote-tracking branch 'upstream/pull/2919' into master

4 years agoAvoid some uses of html_safe
Andy Allan [Wed, 28 Oct 2020 13:45:15 +0000 (14:45 +0100)]
Avoid some uses of html_safe

We can use `html_safe` on non-interpolated strings, since that's trusted content.

4 years agoMerge remote-tracking branch 'upstream/pull/2918' into master
Tom Hughes [Wed, 28 Oct 2020 11:29:57 +0000 (11:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2918' into master

4 years agoEnsure that test utility methods are marked as private
Andy Allan [Wed, 28 Oct 2020 10:49:01 +0000 (11:49 +0100)]
Ensure that test utility methods are marked as private

This allows us to enable the check for test method names.

4 years agoRefactor test to use general basic_authorization_header method
Andy Allan [Wed, 28 Oct 2020 10:33:51 +0000 (11:33 +0100)]
Refactor test to use general basic_authorization_header method

There's no need for this test to have its own version of the method.

4 years agoMerge remote-tracking branch 'upstream/pull/2917' into master
Tom Hughes [Wed, 28 Oct 2020 10:22:01 +0000 (10:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2917' into master

4 years agoResolve some extra-long lines
Andy Allan [Wed, 28 Oct 2020 10:07:34 +0000 (11:07 +0100)]
Resolve some extra-long lines

4 years agoMerge remote-tracking branch 'upstream/pull/2916' into master
Tom Hughes [Wed, 28 Oct 2020 08:25:02 +0000 (08:25 +0000)]
Merge remote-tracking branch 'upstream/pull/2916' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2915' into master
Tom Hughes [Wed, 28 Oct 2020 08:25:00 +0000 (08:25 +0000)]
Merge remote-tracking branch 'upstream/pull/2915' into master

4 years agoBump puma from 5.0.3 to 5.0.4
dependabot[bot] [Wed, 28 Oct 2020 05:02:41 +0000 (05:02 +0000)]
Bump puma from 5.0.3 to 5.0.4

Bumps [puma](https://github.com/puma/puma) from 5.0.3 to 5.0.4.
- [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/v5.0.3...v5.0.4)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoUpdate to iD v2.19.1
Quincy Morgan [Wed, 28 Oct 2020 01:17:47 +0000 (21:17 -0400)]
Update to iD v2.19.1

4 years agoMerge remote-tracking branch 'upstream/pull/2914' into master
Tom Hughes [Tue, 27 Oct 2020 22:44:07 +0000 (22:44 +0000)]
Merge remote-tracking branch 'upstream/pull/2914' into master

4 years agoUpdate to iD v2.19.0
Quincy Morgan [Tue, 27 Oct 2020 21:46:24 +0000 (17:46 -0400)]
Update to iD v2.19.0

4 years agoMerge remote-tracking branch 'upstream/pull/2912' into master
Tom Hughes [Tue, 27 Oct 2020 08:10:27 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/2912' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2911' into master
Tom Hughes [Tue, 27 Oct 2020 08:10:25 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/2911' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2910' into master
Tom Hughes [Tue, 27 Oct 2020 08:10:23 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/2910' into master

4 years agoBump bootsnap from 1.4.8 to 1.4.9
dependabot[bot] [Tue, 27 Oct 2020 05:02:12 +0000 (05:02 +0000)]
Bump bootsnap from 1.4.8 to 1.4.9

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.8 to 1.4.9.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.8...v1.4.9)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump eslint from 7.12.0 to 7.12.1
dependabot[bot] [Tue, 27 Oct 2020 05:01:35 +0000 (05:01 +0000)]
Bump eslint from 7.12.0 to 7.12.1

Bumps [eslint](https://github.com/eslint/eslint) from 7.12.0 to 7.12.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.12.0...v7.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump puma from 5.0.2 to 5.0.3
dependabot[bot] [Tue, 27 Oct 2020 05:01:29 +0000 (05:01 +0000)]
Bump puma from 5.0.2 to 5.0.3

Bumps [puma](https://github.com/puma/puma) from 5.0.2 to 5.0.3.
- [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/v5.0.2...v5.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Oct 2020 15:06:52 +0000 (16:06 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2907' into master
Tom Hughes [Mon, 26 Oct 2020 08:14:18 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2907' into master

4 years agoMerge remote-tracking branch 'upstream/pull/2906' into master
Tom Hughes [Mon, 26 Oct 2020 08:14:14 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2906' into master

4 years agoBump strong_migrations from 0.7.1 to 0.7.2
dependabot[bot] [Mon, 26 Oct 2020 05:02:44 +0000 (05:02 +0000)]
Bump strong_migrations from 0.7.1 to 0.7.2

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.1 to 0.7.2.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.1...v0.7.2)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump eslint from 7.11.0 to 7.12.0
dependabot[bot] [Mon, 26 Oct 2020 05:01:36 +0000 (05:01 +0000)]
Bump eslint from 7.11.0 to 7.12.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.11.0 to 7.12.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.11.0...v7.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Oct 2020 11:08:56 +0000 (13:08 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2890'
Tom Hughes [Wed, 21 Oct 2020 19:53:15 +0000 (20:53 +0100)]
Merge remote-tracking branch 'upstream/pull/2890'

4 years agoFix close handler for welcome message
Tom Hughes [Wed, 21 Oct 2020 19:49:27 +0000 (20:49 +0100)]
Fix close handler for welcome message

4 years agoMerge remote-tracking branch 'upstream/pull/2901'
Tom Hughes [Wed, 21 Oct 2020 19:51:03 +0000 (20:51 +0100)]
Merge remote-tracking branch 'upstream/pull/2901'

4 years agoMerge pull request #2902 from seav/patch-1
Andy Allan [Wed, 21 Oct 2020 15:36:26 +0000 (17:36 +0200)]
Merge pull request #2902 from seav/patch-1

Link to official OWG Banner Policy page

4 years agoLink to official OWG Banner Policy page
Eugene Alvin Villar [Wed, 21 Oct 2020 15:25:51 +0000 (23:25 +0800)]
Link to official OWG Banner Policy page

- Link to the official Banner Policy page on the OWG website instead of a GitHub ticket discussion
- Reformat Markdown lists so that the rendered HTML results in properly nested lists

4 years agoUse flexbox to position the close icon on the sidebars
Andy Allan [Thu, 15 Oct 2020 14:25:33 +0000 (16:25 +0200)]
Use flexbox to position the close icon on the sidebars

This ensures that the text and the close icon don't overlap, regardless
of the length of the title. The title div grows to use all available
space, while ensuring the text breaks if necessary to prevent it from
pushing the close icon offscreen.

4 years agoMerge remote-tracking branch 'upstream/pull/2899'
Tom Hughes [Wed, 21 Oct 2020 14:12:05 +0000 (15:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2899'

4 years agoMerge remote-tracking branch 'upstream/pull/2898'
Tom Hughes [Wed, 21 Oct 2020 14:11:15 +0000 (15:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2898'

4 years agoAvoid various uses of html_safe
Andy Allan [Wed, 21 Oct 2020 12:12:14 +0000 (14:12 +0200)]
Avoid various uses of html_safe

We can avoid using `html_safe` in various circumstances, through alternative approaches like i18n keys ending in `_html` or using `safe_join` to avoid converting via unsafe string types.

The `_html` keys approach only work for ActionView helper version of `t`, not the base `I18n.t` method.

4 years agoRemove unused translation
Andy Allan [Wed, 21 Oct 2020 13:38:53 +0000 (15:38 +0200)]
Remove unused translation

The code that used this was removed in 9a9e13af901e9d66357135fb39b111fc9e26b3b2

4 years agoRemove unused translations
Andy Allan [Wed, 21 Oct 2020 13:37:57 +0000 (15:37 +0200)]
Remove unused translations

The code that used these translations was removed in aaeca5b5346b01d7ef26a301492804d36049eff8

4 years agoMerge remote-tracking branch 'upstream/pull/2896'
Tom Hughes [Tue, 20 Oct 2020 12:21:24 +0000 (13:21 +0100)]
Merge remote-tracking branch 'upstream/pull/2896'

4 years agoFix call to UserMailer in message delivery
Andy Allan [Tue, 20 Oct 2020 11:58:08 +0000 (13:58 +0200)]
Fix call to UserMailer in message delivery

Fixes #2895

4 years agoMerge remote-tracking branch 'upstream/pull/2894'
Tom Hughes [Tue, 20 Oct 2020 07:17:16 +0000 (08:17 +0100)]
Merge remote-tracking branch 'upstream/pull/2894'

4 years agoMerge remote-tracking branch 'upstream/pull/2893'
Tom Hughes [Tue, 20 Oct 2020 07:17:12 +0000 (08:17 +0100)]
Merge remote-tracking branch 'upstream/pull/2893'

4 years agoBump aws-sdk-s3 from 1.83.0 to 1.83.1
dependabot[bot] [Tue, 20 Oct 2020 05:03:51 +0000 (05:03 +0000)]
Bump aws-sdk-s3 from 1.83.0 to 1.83.1

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.83.0 to 1.83.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoBump omniauth-facebook from 7.0.0 to 8.0.0
dependabot[bot] [Tue, 20 Oct 2020 05:02:46 +0000 (05:02 +0000)]
Bump omniauth-facebook from 7.0.0 to 8.0.0

Bumps [omniauth-facebook](https://github.com/simi/omniauth-facebook) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/simi/omniauth-facebook/releases)
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/simi/omniauth-facebook/compare/v7.0.0...v8.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoUpdate test results for presence of zh-HK translations
Tom Hughes [Mon, 19 Oct 2020 18:26:17 +0000 (19:26 +0100)]
Update test results for presence of zh-HK translations

4 years agoMerge remote-tracking branch 'upstream/pull/2892'
Tom Hughes [Mon, 19 Oct 2020 18:23:48 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2892'

4 years agoMerge remote-tracking branch 'upstream/pull/2891'
Tom Hughes [Mon, 19 Oct 2020 18:23:46 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2891'