]> git.openstreetmap.org Git - rails.git/log
rails.git
15 months agoUpdate diary entry styling
Anton Khorev [Tue, 8 Aug 2023 14:36:02 +0000 (17:36 +0300)]
Update diary entry styling

user_<id> class was kept because
https://github.com/openstreetmap/openstreetmap-website/pull/2266

15 months agoMerge remote-tracking branch 'upstream/pull/4154'
Tom Hughes [Thu, 10 Aug 2023 21:42:39 +0000 (22:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4154'

15 months agoUpdate to rails 7.0.7
Tom Hughes [Thu, 10 Aug 2023 20:18:24 +0000 (21:18 +0100)]
Update to rails 7.0.7

15 months agoRemove message header custom css
Anton Khorev [Thu, 10 Aug 2023 17:47:41 +0000 (20:47 +0300)]
Remove message header custom css

15 months agoCheck recipient condition separately for message header/footer
Anton Khorev [Thu, 10 Aug 2023 17:38:49 +0000 (20:38 +0300)]
Check recipient condition separately for message header/footer

15 months agoRemove message date float
Anton Khorev [Thu, 10 Aug 2023 17:23:13 +0000 (20:23 +0300)]
Remove message date float

15 months agoMerge remote-tracking branch 'upstream/pull/4152'
Tom Hughes [Thu, 10 Aug 2023 17:06:20 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/4152'

15 months agoMerge remote-tracking branch 'upstream/pull/4153'
Tom Hughes [Thu, 10 Aug 2023 17:01:01 +0000 (18:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4153'

15 months agoMerge remote-tracking branch 'upstream/pull/4151'
Tom Hughes [Thu, 10 Aug 2023 16:56:57 +0000 (17:56 +0100)]
Merge remote-tracking branch 'upstream/pull/4151'

15 months agoRemove custom css for OpenID logo
Anton Khorev [Thu, 10 Aug 2023 16:27:48 +0000 (19:27 +0300)]
Remove custom css for OpenID logo

15 months agoUse Bootstrap inline lists for <dl>s on user pages
Anton Khorev [Thu, 10 Aug 2023 16:12:25 +0000 (19:12 +0300)]
Use Bootstrap inline lists for <dl>s on user pages

15 months agoRemove unnecessary css from diary entry locations
Anton Khorev [Thu, 10 Aug 2023 15:40:05 +0000 (18:40 +0300)]
Remove unnecessary css from diary entry locations

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 Aug 2023 11:26:11 +0000 (13:26 +0200)]
Localisation updates from https://translatewiki.net.

15 months agoMerge remote-tracking branch 'upstream/pull/4135'
Tom Hughes [Wed, 9 Aug 2023 18:22:36 +0000 (19:22 +0100)]
Merge remote-tracking branch 'upstream/pull/4135'

15 months agoMerge remote-tracking branch 'upstream/pull/4132'
Tom Hughes [Wed, 9 Aug 2023 18:20:54 +0000 (19:20 +0100)]
Merge remote-tracking branch 'upstream/pull/4132'

15 months agoMerge remote-tracking branch 'upstream/pull/4145'
Tom Hughes [Tue, 8 Aug 2023 17:37:00 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4145'

15 months agoTake exclude_place_ids from Nominatim results directly
Tom Hughes [Tue, 8 Aug 2023 17:27:53 +0000 (18:27 +0100)]
Take exclude_place_ids from Nominatim results directly

Fixes #4137

15 months agoRemove 'no home' message css from profile edit form
Anton Khorev [Tue, 8 Aug 2023 17:25:48 +0000 (20:25 +0300)]
Remove 'no home' message css from profile edit form

15 months agoRemove unused user image css from profile edit form
Anton Khorev [Tue, 8 Aug 2023 16:59:50 +0000 (19:59 +0300)]
Remove unused user image css from profile edit form

15 months agoMerge remote-tracking branch 'upstream/pull/4143'
Tom Hughes [Tue, 8 Aug 2023 16:55:46 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/pull/4143'

15 months agoMerge remote-tracking branch 'upstream/pull/4142'
Tom Hughes [Tue, 8 Aug 2023 16:53:35 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4142'

15 months agoUpdate bundle
Tom Hughes [Tue, 8 Aug 2023 16:46:15 +0000 (17:46 +0100)]
Update bundle

15 months agoRemove old rails error css
Anton Khorev [Tue, 8 Aug 2023 02:45:25 +0000 (05:45 +0300)]
Remove old rails error css

15 months agoExpose changeset query limit values in api capabilities
Anton Khorev [Tue, 8 Aug 2023 00:49:14 +0000 (03:49 +0300)]
Expose changeset query limit values in api capabilities

15 months agoUse max changeset query limit setting in tests
Anton Khorev [Tue, 8 Aug 2023 00:41:04 +0000 (03:41 +0300)]
Use max changeset query limit setting in tests

15 months agoMove changeset query limit values to settings
Anton Khorev [Tue, 8 Aug 2023 00:33:04 +0000 (03:33 +0300)]
Move changeset query limit values to settings

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Aug 2023 11:17:26 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Aug 2023 11:17:38 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.

15 months agoMerge remote-tracking branch 'upstream/pull/4136'
Tom Hughes [Thu, 3 Aug 2023 10:25:14 +0000 (11:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4136'

15 months agoUse hashes to define where..in sql queries
Andy Allan [Thu, 3 Aug 2023 09:56:05 +0000 (10:56 +0100)]
Use hashes to define where..in sql queries

This is preferable to using SQL statements.

15 months agoAdd titles to issue pages
Anton Khorev [Thu, 3 Aug 2023 00:09:54 +0000 (03:09 +0300)]
Add titles to issue pages

15 months agoStretch login menu buttons in small nav mode
Anton Khorev [Wed, 2 Aug 2023 17:01:48 +0000 (20:01 +0300)]
Stretch login menu buttons in small nav mode

15 months agoMerge remote-tracking branch 'upstream/pull/4131'
Tom Hughes [Wed, 2 Aug 2023 16:01:05 +0000 (17:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4131'

15 months agoMerge pull request #4106 from tomhughes/diary-paging
Andy Allan [Wed, 2 Aug 2023 15:57:26 +0000 (16:57 +0100)]
Merge pull request #4106 from tomhughes/diary-paging

Replace page numbers with ID based selection for diary indexes

15 months agoMerge pull request #4111 from AntonKhorev/hidden-welcome-banner
Andy Allan [Wed, 2 Aug 2023 15:56:25 +0000 (16:56 +0100)]
Merge pull request #4111 from AntonKhorev/hidden-welcome-banner

Hide/show welcome banner with hidden attribute

15 months agoSwitch to bootstrap recommended viewport definition
Andy Allan [Wed, 2 Aug 2023 15:07:13 +0000 (16:07 +0100)]
Switch to bootstrap recommended viewport definition

Original version was introduced in 6674873478c9fe221d2fd78f76cabc6d4b03c0aa
and has not been changed since.

Google's PageSpeed Insights tool also flagged this up as an accessibility
issue, since it previously prohibited users zooming into the site.

15 months agoMerge pull request #4112 from AntonKhorev/no-float-inside-sidebar
Andy Allan [Wed, 2 Aug 2023 14:54:16 +0000 (15:54 +0100)]
Merge pull request #4112 from AntonKhorev/no-float-inside-sidebar

Remove unnecessary full-width float css from sidebar

15 months agoMerge pull request #4125 from tomhughes/oauth-scopes
Andy Allan [Wed, 2 Aug 2023 14:52:41 +0000 (15:52 +0100)]
Merge pull request #4125 from tomhughes/oauth-scopes

Only show granted permissions in the authorized application list

15 months agoMerge pull request #4107 from tomhughes/diary-visibility
Andy Allan [Wed, 2 Aug 2023 13:47:05 +0000 (14:47 +0100)]
Merge pull request #4107 from tomhughes/diary-visibility

Allow administrators to see deleted diary entries

15 months agoMerge pull request #4113 from AntonKhorev/no-w-100
Andy Allan [Wed, 2 Aug 2023 13:20:07 +0000 (14:20 +0100)]
Merge pull request #4113 from AntonKhorev/no-w-100

Remove setting 100% width with w-100 where it's the default width

15 months agoMerge pull request #4120 from AntonKhorev/no-deprecated-iframe-attrs
Andy Allan [Wed, 2 Aug 2023 13:14:55 +0000 (14:14 +0100)]
Merge pull request #4120 from AntonKhorev/no-deprecated-iframe-attrs

Remove deprecated attributes from share html

15 months agoUpdate bundle
Tom Hughes [Tue, 1 Aug 2023 17:14:23 +0000 (18:14 +0100)]
Update bundle

15 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 31 Jul 2023 11:20:39 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.

15 months agoOnly show granted permissions in the authorized application list
Tom Hughes [Sun, 30 Jul 2023 19:35:13 +0000 (20:35 +0100)]
Only show granted permissions in the authorized application list

Fixes #4124

15 months agoMerge remote-tracking branch 'upstream/pull/4114'
Tom Hughes [Sun, 30 Jul 2023 18:00:02 +0000 (19:00 +0100)]
Merge remote-tracking branch 'upstream/pull/4114'

15 months agoMerge remote-tracking branch 'upstream/pull/4115'
Tom Hughes [Sun, 30 Jul 2023 17:53:30 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4115'

15 months agoMerge remote-tracking branch 'upstream/pull/4110'
Tom Hughes [Sun, 30 Jul 2023 17:48:26 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4110'

15 months agoMerge remote-tracking branch 'upstream/pull/4118'
Tom Hughes [Sun, 30 Jul 2023 17:47:10 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4118'

15 months agoMerge remote-tracking branch 'upstream/pull/4119'
Tom Hughes [Sun, 30 Jul 2023 17:36:24 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4119'

15 months agoMerge remote-tracking branch 'upstream/pull/4116'
Tom Hughes [Sun, 30 Jul 2023 17:31:43 +0000 (18:31 +0100)]
Merge remote-tracking branch 'upstream/pull/4116'

15 months agoRemove deprecated attributes from share html
Anton Khorev [Sat, 29 Jul 2023 17:34:10 +0000 (20:34 +0300)]
Remove deprecated attributes from share html

15 months agoRemove resize css property from textarea
Anton Khorev [Sat, 29 Jul 2023 16:38:06 +0000 (19:38 +0300)]
Remove resize css property from textarea

15 months agoRemove display properties from share tabs
Anton Khorev [Sat, 29 Jul 2023 16:26:20 +0000 (19:26 +0300)]
Remove display properties from share tabs

15 months agoBump eslint from 8.45.0 to 8.46.0
dependabot[bot] [Fri, 28 Jul 2023 23:15:35 +0000 (23:15 +0000)]
Bump eslint from 8.45.0 to 8.46.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.45.0 to 8.46.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.45.0...v8.46.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
15 months agoMove map attribution print styles to print.scss
Anton Khorev [Fri, 28 Jul 2023 18:24:52 +0000 (21:24 +0300)]
Move map attribution print styles to print.scss

15 months agoRemove unused 0 bottom margin from map ui css
Anton Khorev [Fri, 28 Jul 2023 18:05:05 +0000 (21:05 +0300)]
Remove unused 0 bottom margin from map ui css

15 months agoRemove setting 100% width with w-100 where it's the default width
Anton Khorev [Fri, 28 Jul 2023 17:27:58 +0000 (20:27 +0300)]
Remove setting 100% width with w-100 where it's the default width

15 months agoRemove unnecessary full-width float css from sidebar
Anton Khorev [Fri, 28 Jul 2023 17:05:28 +0000 (20:05 +0300)]
Remove unnecessary full-width float css from sidebar

15 months agoHide/show welcome banner with hidden attribute
Anton Khorev [Fri, 28 Jul 2023 15:24:46 +0000 (18:24 +0300)]
Hide/show welcome banner with hidden attribute

15 months agoRemove links to apps from OAuth2 authorizations page
Anton Khorev [Fri, 28 Jul 2023 14:30:48 +0000 (17:30 +0300)]
Remove links to apps from OAuth2 authorizations page

15 months agoMerge remote-tracking branch 'upstream/pull/4108'
Tom Hughes [Thu, 27 Jul 2023 19:42:03 +0000 (20:42 +0100)]
Merge remote-tracking branch 'upstream/pull/4108'

15 months agoReplace page numbers with ID based selection for diary indexes
Tom Hughes [Wed, 26 Jul 2023 17:50:01 +0000 (18:50 +0100)]
Replace page numbers with ID based selection for diary indexes

15 months agoImprove testing of paged access to trace lists
Tom Hughes [Thu, 27 Jul 2023 19:30:15 +0000 (20:30 +0100)]
Improve testing of paged access to trace lists

15 months agoDisambiguate ID queries for tagged trace lists
Tom Hughes [Thu, 27 Jul 2023 19:29:29 +0000 (20:29 +0100)]
Disambiguate ID queries for tagged trace lists

15 months agoAllow moderator to unhide diary entries as well as hide them
Tom Hughes [Thu, 27 Jul 2023 17:07:35 +0000 (18:07 +0100)]
Allow moderator to unhide diary entries as well as hide them

15 months agoAllow administrators to see deleted diary entries
Tom Hughes [Wed, 26 Jul 2023 18:01:48 +0000 (19:01 +0100)]
Allow administrators to see deleted diary entries

15 months agoSimplify menu-icon css
Andy Allan [Wed, 26 Jul 2023 16:39:36 +0000 (17:39 +0100)]
Simplify menu-icon css

Remove the duplicate display property, since it was force-overridden
by the `!important` keyword in the same definiton. This then makes the
`!important` keywords unnecessary. The menu-icon is floated, and
therefore can't be `inline-block`, so browsers were interpreting that
as `block` all along.

15 months agoRemove unused parameter
Andy Allan [Wed, 26 Jul 2023 16:39:12 +0000 (17:39 +0100)]
Remove unused parameter

15 months agoRemove unused CSS
Andy Allan [Wed, 26 Jul 2023 16:11:58 +0000 (17:11 +0100)]
Remove unused CSS

The browse_details CSS classes were removed in 30ab1e91da6710159285f354c24529bdeeb7fb64 and c4090bb150e0eb866151ba0477e50b0421d60527

15 months agoMerge pull request #3933 from AntonKhorev/api-changesets-limit
Andy Allan [Wed, 26 Jul 2023 15:45:00 +0000 (16:45 +0100)]
Merge pull request #3933 from AntonKhorev/api-changesets-limit

Add limit parameter to api changesets query

15 months agoMerge pull request #4089 from tomhughes/trace-paging
Andy Allan [Wed, 26 Jul 2023 15:21:22 +0000 (16:21 +0100)]
Merge pull request #4089 from tomhughes/trace-paging

Replace page numbers with ID based selection for trace indexes

15 months agoUpdate bundle
Tom Hughes [Tue, 25 Jul 2023 17:10:53 +0000 (18:10 +0100)]
Update bundle

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Jul 2023 11:18:53 +0000 (13:18 +0200)]
Localisation updates from https://translatewiki.net.

16 months agoReplace page numbers with ID based selection for trace indexes
Tom Hughes [Wed, 12 Jul 2023 18:42:29 +0000 (19:42 +0100)]
Replace page numbers with ID based selection for trace indexes

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Jul 2023 11:15:14 +0000 (13:15 +0200)]
Localisation updates from https://translatewiki.net.

16 months agoFix new rubocop warnings
Tom Hughes [Tue, 18 Jul 2023 17:27:06 +0000 (18:27 +0100)]
Fix new rubocop warnings

16 months agoUpdate bundle
Tom Hughes [Tue, 18 Jul 2023 17:25:12 +0000 (18:25 +0100)]
Update bundle

16 months agoMerge remote-tracking branch 'upstream/pull/4097'
Tom Hughes [Sun, 16 Jul 2023 11:07:00 +0000 (12:07 +0100)]
Merge remote-tracking branch 'upstream/pull/4097'

16 months agoMerge remote-tracking branch 'upstream/pull/4095'
Tom Hughes [Sun, 16 Jul 2023 11:06:57 +0000 (12:06 +0100)]
Merge remote-tracking branch 'upstream/pull/4095'

16 months agoMerge remote-tracking branch 'upstream/pull/4094'
Tom Hughes [Sun, 16 Jul 2023 11:06:54 +0000 (12:06 +0100)]
Merge remote-tracking branch 'upstream/pull/4094'

16 months agoConsistent plural forms for browse.way.nodes_count
Amir E. Aharoni [Sat, 15 Jul 2023 07:34:24 +0000 (10:34 +0300)]
Consistent plural forms for browse.way.nodes_count

Without this, translatewiki's validator shows an error for English.

16 months agoBump eslint from 8.44.0 to 8.45.0
dependabot[bot] [Fri, 14 Jul 2023 23:02:08 +0000 (23:02 +0000)]
Bump eslint from 8.44.0 to 8.45.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.44.0 to 8.45.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.44.0...v8.45.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
16 months agoBump coverallsapp/github-action from 2.2.0 to 2.2.1
dependabot[bot] [Thu, 13 Jul 2023 23:19:20 +0000 (23:19 +0000)]
Bump coverallsapp/github-action from 2.2.0 to 2.2.1

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.0...v2.2.1)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
16 months agoRemove default imagery blacklist
Tom Hughes [Thu, 13 Jul 2023 19:13:29 +0000 (20:13 +0100)]
Remove default imagery blacklist

16 months agoMerge remote-tracking branch 'upstream/pull/4093'
Tom Hughes [Thu, 13 Jul 2023 17:36:24 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4093'

16 months agoBlock mapy.cz as non-approved imagery
Pavel Zbytovský [Thu, 13 Jul 2023 17:04:24 +0000 (19:04 +0200)]
Block mapy.cz as non-approved imagery

Issue: https://github.com/openstreetmap/openstreetmap-website/issues/4085

16 months agoMerge remote-tracking branch 'upstream/pull/4092'
Tom Hughes [Thu, 13 Jul 2023 12:25:56 +0000 (13:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4092'

16 months agoUpdate to iD v2.26.2
Martin Raifer [Thu, 13 Jul 2023 12:04:21 +0000 (14:04 +0200)]
Update to iD v2.26.2

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Jul 2023 11:19:25 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.

16 months agoMerge remote-tracking branch 'upstream/pull/4091'
Tom Hughes [Thu, 13 Jul 2023 07:03:52 +0000 (08:03 +0100)]
Merge remote-tracking branch 'upstream/pull/4091'

16 months agoBump osm-community-index from 5.5.3 to 5.5.4
dependabot[bot] [Wed, 12 Jul 2023 23:58:30 +0000 (23:58 +0000)]
Bump osm-community-index from 5.5.3 to 5.5.4

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.3 to 5.5.4.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.3...v5.5.4)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
16 months agoMerge remote-tracking branch 'upstream/pull/4090'
Tom Hughes [Wed, 12 Jul 2023 20:57:17 +0000 (21:57 +0100)]
Merge remote-tracking branch 'upstream/pull/4090'

16 months agoUpdate to iD v2.26.1
Martin Raifer [Wed, 12 Jul 2023 20:19:43 +0000 (22:19 +0200)]
Update to iD v2.26.1

16 months agoMerge remote-tracking branch 'upstream/pull/4088'
Tom Hughes [Wed, 12 Jul 2023 17:34:56 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4088'

16 months agoMerge remote-tracking branch 'upstream/pull/4086'
Tom Hughes [Wed, 12 Jul 2023 17:26:25 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4086'

16 months agoAvoid using sprockets for combining stylesheets
Andy Allan [Wed, 12 Jul 2023 16:46:01 +0000 (17:46 +0100)]
Avoid using sprockets for combining stylesheets

There are two options for combining stylesheets, using sprockets
(via `require` statements) or using sass (via `@import` statements).

This commit switches to using `@import` statements throughout, to
avoid a bug with libsass that prevents us from using bootstrap 5.2+

See https://github.com/sass/sassc-rails/issues/174

Since R2 is not triggered when `@import`ing a file, we need to
switch the top-level stylesheet names to include the extension. We
can also take the opportunity to remove a level of indirection,
along with removing symlinks which cause problems on some platforms.

* https://github.com/openstreetmap/openstreetmap-website/issues/3984
* https://github.com/openstreetmap/openstreetmap-website/issues/3422

16 months agoUpdate to iD v2.26.0
Martin Raifer [Wed, 12 Jul 2023 11:57:19 +0000 (13:57 +0200)]
Update to iD v2.26.0

16 months agoUpdate bundle
Tom Hughes [Tue, 11 Jul 2023 17:16:45 +0000 (18:16 +0100)]
Update bundle

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 Jul 2023 11:33:02 +0000 (13:33 +0200)]
Localisation updates from https://translatewiki.net.

16 months agoMerge remote-tracking branch 'upstream/pull/4078'
Tom Hughes [Thu, 6 Jul 2023 21:16:03 +0000 (22:16 +0100)]
Merge remote-tracking branch 'upstream/pull/4078'