]>
git.openstreetmap.org Git - rails.git/log
translatewiki.net [Mon, 9 Nov 2020 11:47:12 +0000 (12:47 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 9 Nov 2020 08:11:28 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2944' into master
Tom Hughes [Mon, 9 Nov 2020 08:11:25 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2943' into master
Tom Hughes [Mon, 9 Nov 2020 08:11:23 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2942' into master
Tom Hughes [Mon, 9 Nov 2020 08:11:19 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2941' into master
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>
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>
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>
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>
Tom Hughes [Fri, 6 Nov 2020 08:17:13 +0000 (08:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2939' into master
Tom Hughes [Fri, 6 Nov 2020 08:17:10 +0000 (08:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2938' into master
Tom Hughes [Fri, 6 Nov 2020 08:17:06 +0000 (08:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2937' into master
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>
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>
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>
Tom Hughes [Thu, 5 Nov 2020 12:40:50 +0000 (12:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2935' into master
Tom Hughes [Thu, 5 Nov 2020 12:40:46 +0000 (12:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2934' into master
translatewiki.net [Thu, 5 Nov 2020 12:28:49 +0000 (13:28 +0100)]
Localisation updates from https://translatewiki.net.
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>
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>
Tom Hughes [Tue, 3 Nov 2020 19:19:28 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/2931' into master
Tom Hughes [Tue, 3 Nov 2020 19:19:13 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/2933' into master
Tom Hughes [Tue, 3 Nov 2020 19:19:11 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/pull/2932' into master
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>
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>
Quincy Morgan [Mon, 2 Nov 2020 15:27:31 +0000 (10:27 -0500)]
Update to iD v2.19.4
translatewiki.net [Mon, 2 Nov 2020 11:51:54 +0000 (12:51 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 2 Nov 2020 08:25:20 +0000 (08:25 +0000)]
Merge remote-tracking branch 'upstream/pull/2929' into master
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>
Tom Hughes [Sun, 1 Nov 2020 14:49:35 +0000 (14:49 +0000)]
Merge remote-tracking branch 'upstream/pull/2923' into master
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.
Quincy Morgan [Thu, 29 Oct 2020 19:12:49 +0000 (15:12 -0400)]
Update to iD v2.19.3
translatewiki.net [Thu, 29 Oct 2020 12:26:26 +0000 (13:26 +0100)]
Localisation updates from https://translatewiki.net.
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
Tom Hughes [Wed, 28 Oct 2020 15:56:59 +0000 (15:56 +0000)]
Merge remote-tracking branch 'upstream/pull/2920' into master
Quincy Morgan [Wed, 28 Oct 2020 14:58:57 +0000 (10:58 -0400)]
Update to iD v2.19.2
Tom Hughes [Wed, 28 Oct 2020 14:07:55 +0000 (14:07 +0000)]
Merge remote-tracking branch 'upstream/pull/2919' into master
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.
Tom Hughes [Wed, 28 Oct 2020 11:29:57 +0000 (11:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2918' into master
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.
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.
Tom Hughes [Wed, 28 Oct 2020 10:22:01 +0000 (10:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2917' into master
Andy Allan [Wed, 28 Oct 2020 10:07:34 +0000 (11:07 +0100)]
Resolve some extra-long lines
Tom Hughes [Wed, 28 Oct 2020 08:25:02 +0000 (08:25 +0000)]
Merge remote-tracking branch 'upstream/pull/2916' into master
Tom Hughes [Wed, 28 Oct 2020 08:25:00 +0000 (08:25 +0000)]
Merge remote-tracking branch 'upstream/pull/2915' into master
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>
Quincy Morgan [Wed, 28 Oct 2020 01:17:47 +0000 (21:17 -0400)]
Update to iD v2.19.1
Tom Hughes [Tue, 27 Oct 2020 22:44:07 +0000 (22:44 +0000)]
Merge remote-tracking branch 'upstream/pull/2914' into master
Quincy Morgan [Tue, 27 Oct 2020 21:46:24 +0000 (17:46 -0400)]
Update to iD v2.19.0
Tom Hughes [Tue, 27 Oct 2020 08:10:27 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/2912' into master
Tom Hughes [Tue, 27 Oct 2020 08:10:25 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/2911' into master
Tom Hughes [Tue, 27 Oct 2020 08:10:23 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/2910' into master
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>
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>
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>
translatewiki.net [Mon, 26 Oct 2020 15:06:52 +0000 (16:06 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 26 Oct 2020 08:14:18 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2907' into master
Tom Hughes [Mon, 26 Oct 2020 08:14:14 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2906' into master
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>
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>
translatewiki.net [Thu, 22 Oct 2020 11:08:56 +0000 (13:08 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 21 Oct 2020 19:53:15 +0000 (20:53 +0100)]
Merge remote-tracking branch 'upstream/pull/2890'
Tom Hughes [Wed, 21 Oct 2020 19:49:27 +0000 (20:49 +0100)]
Fix close handler for welcome message
Tom Hughes [Wed, 21 Oct 2020 19:51:03 +0000 (20:51 +0100)]
Merge remote-tracking branch 'upstream/pull/2901'
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
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
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.
Tom Hughes [Wed, 21 Oct 2020 14:12:05 +0000 (15:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2899'
Tom Hughes [Wed, 21 Oct 2020 14:11:15 +0000 (15:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2898'
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.
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
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
Tom Hughes [Tue, 20 Oct 2020 12:21:24 +0000 (13:21 +0100)]
Merge remote-tracking branch 'upstream/pull/2896'
Andy Allan [Tue, 20 Oct 2020 11:58:08 +0000 (13:58 +0200)]
Fix call to UserMailer in message delivery
Fixes #2895
Tom Hughes [Tue, 20 Oct 2020 07:17:16 +0000 (08:17 +0100)]
Merge remote-tracking branch 'upstream/pull/2894'
Tom Hughes [Tue, 20 Oct 2020 07:17:12 +0000 (08:17 +0100)]
Merge remote-tracking branch 'upstream/pull/2893'
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>
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>
Tom Hughes [Mon, 19 Oct 2020 18:26:17 +0000 (19:26 +0100)]
Update test results for presence of zh-HK translations
Tom Hughes [Mon, 19 Oct 2020 18:23:48 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2892'
Tom Hughes [Mon, 19 Oct 2020 18:23:46 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2891'
translatewiki.net [Mon, 19 Oct 2020 13:01:22 +0000 (15:01 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Mon, 19 Oct 2020 05:02:17 +0000 (05:02 +0000)]
Bump webmock from 3.9.2 to 3.9.3
Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.2 to 3.9.3.
- [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.2...v3.9.3)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Mon, 19 Oct 2020 05:01:26 +0000 (05:01 +0000)]
Bump faraday from 1.0.1 to 1.1.0
Bumps [faraday](https://github.com/lostisland/faraday) from 1.0.1 to 1.1.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v1.0.1...v1.1.0)
Signed-off-by: dependabot[bot] <support@github.com>
Hidde Wieringa [Sat, 17 Oct 2020 15:00:40 +0000 (17:00 +0200)]
Also fix private road
Hidde Wieringa [Sat, 17 Oct 2020 14:55:18 +0000 (16:55 +0200)]
Update icon for destination access in map key
Tom Hughes [Fri, 16 Oct 2020 07:26:56 +0000 (08:26 +0100)]
Merge remote-tracking branch 'upstream/pull/2888'
dependabot[bot] [Fri, 16 Oct 2020 05:02:14 +0000 (05:02 +0000)]
Bump activerecord-import from 1.0.6 to 1.0.7
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.6...v1.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 15 Oct 2020 07:12:25 +0000 (08:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2887'
Tom Hughes [Thu, 15 Oct 2020 07:12:21 +0000 (08:12 +0100)]
Merge remote-tracking branch 'upstream/pull/2884'
dependabot[bot] [Thu, 15 Oct 2020 05:01:21 +0000 (05:01 +0000)]
Bump i18n-js from 3.7.1 to 3.8.0
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.1...v3.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Andy Allan [Wed, 14 Oct 2020 13:04:58 +0000 (15:04 +0200)]
Rename Notifier to UserMailer
It's a convention in rails to name your mailers with a Mailer suffix, and is also common to name the class after the recipient (e.g. User, Admin). So UserMailer seems a reasonable choice.
Tom Hughes [Tue, 13 Oct 2020 07:14:20 +0000 (08:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2881'
Tom Hughes [Tue, 13 Oct 2020 07:14:18 +0000 (08:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2880'
dependabot[bot] [Tue, 13 Oct 2020 05:01:31 +0000 (05:01 +0000)]
Bump rubocop from 0.93.0 to 0.93.1
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.0 to 0.93.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.93.0...v0.93.1)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Tue, 13 Oct 2020 05:01:16 +0000 (05:01 +0000)]
Bump webmock from 3.9.1 to 3.9.2
Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.1 to 3.9.2.
- [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.1...v3.9.2)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Mon, 12 Oct 2020 18:08:10 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/2879'
translatewiki.net [Mon, 12 Oct 2020 13:58:23 +0000 (15:58 +0200)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Mon, 12 Oct 2020 05:01:55 +0000 (05:01 +0000)]
Bump eslint from 7.10.0 to 7.11.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.10.0 to 7.11.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.10.0...v7.11.0)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Fri, 9 Oct 2020 07:26:38 +0000 (08:26 +0100)]
Fix new rubocop warnings