]> git.openstreetmap.org Git - rails.git/log
rails.git
15 months agoMerge pull request #3860 from gravitystorm/yaml_quoting
Andy Allan [Wed, 28 Dec 2022 14:05:11 +0000 (14:05 +0000)]
Merge pull request #3860 from gravitystorm/yaml_quoting

Quote ruby versions in yaml

15 months agoQuote ruby versions in yaml
Andy Allan [Wed, 28 Dec 2022 10:01:37 +0000 (10:01 +0000)]
Quote ruby versions in yaml

Without quotes these are parsed as numbers, which can cause subtle
problems. For example, "ruby: 3.0" is interpreted by the
ruby/setup-rubyaction as "ruby: 3", meaning 3.x instead of the
intended 3.0.x

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Dec 2022 12:16:29 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoDon't allow any abilities for inactive users
Tom Hughes [Fri, 23 Dec 2022 16:25:03 +0000 (16:25 +0000)]
Don't allow any abilities for inactive users

16 months agoRevoke authentication tokens when a user is deleted
Tom Hughes [Fri, 23 Dec 2022 16:24:10 +0000 (16:24 +0000)]
Revoke authentication tokens when a user is deleted

16 months agoFix eslint warnings
Tom Hughes [Thu, 22 Dec 2022 17:01:59 +0000 (17:01 +0000)]
Fix eslint warnings

16 months agoFix eslint warnings
Tom Hughes [Thu, 22 Dec 2022 16:59:42 +0000 (16:59 +0000)]
Fix eslint warnings

16 months agoMerge remote-tracking branch 'upstream/pull/3848'
Tom Hughes [Thu, 22 Dec 2022 16:43:41 +0000 (16:43 +0000)]
Merge remote-tracking branch 'upstream/pull/3848'

16 months agoconsistent naming of FOSSGIS routers
Christian Beiwinkel [Thu, 22 Dec 2022 16:39:50 +0000 (17:39 +0100)]
consistent naming of FOSSGIS routers

16 months agoadded manoeuvre numbering
Christian Beiwinkel [Thu, 22 Dec 2022 16:33:20 +0000 (17:33 +0100)]
added manoeuvre numbering

16 months agoMerge remote-tracking branch 'upstream/pull/3857'
Tom Hughes [Thu, 22 Dec 2022 15:52:05 +0000 (15:52 +0000)]
Merge remote-tracking branch 'upstream/pull/3857'

16 months agoMerge remote-tracking branch 'upstream/pull/3856'
Tom Hughes [Thu, 22 Dec 2022 15:49:28 +0000 (15:49 +0000)]
Merge remote-tracking branch 'upstream/pull/3856'

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Dec 2022 12:14:21 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoUse buttons for dropdown toggles
Andy Allan [Thu, 22 Dec 2022 09:56:56 +0000 (09:56 +0000)]
Use buttons for dropdown toggles

These elements don't link to another page, and so there's no need
to use a link that leads to nowhere.

16 months agoPrecompile assets before running tests in actions workflows
Tom Hughes [Wed, 21 Dec 2022 19:13:57 +0000 (19:13 +0000)]
Precompile assets before running tests in actions workflows

16 months agoMake tmp persistent in docker
Tom Hughes [Wed, 21 Dec 2022 19:13:32 +0000 (19:13 +0000)]
Make tmp persistent in docker

16 months agoUpdate storage volume configuration for docker
Tom Hughes [Wed, 21 Dec 2022 18:52:47 +0000 (18:52 +0000)]
Update storage volume configuration for docker

16 months agoUse rails instead of rake
Tom Hughes [Wed, 21 Dec 2022 17:08:30 +0000 (17:08 +0000)]
Use rails instead of rake

16 months agoWait for the button to be disabled, before checking the tooltip behaviour
Andy Allan [Wed, 21 Dec 2022 16:42:02 +0000 (16:42 +0000)]
Wait for the button to be disabled, before checking the tooltip behaviour

Rather than sleeping for a fixed period, we can use Capybara's built-in
ability to wait for elements to be present. Since we're only changing
the state of existing elements though, we need to wait for their
"disabled" property to be set.

Fixes some timing-related problems with the test suite.

16 months agoMerge remote-tracking branch 'upstream/pull/3852'
Tom Hughes [Wed, 21 Dec 2022 15:56:22 +0000 (15:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3852'

16 months agoFix redirection to wiki when terms are declined
Andy Allan [Wed, 21 Dec 2022 15:39:23 +0000 (15:39 +0000)]
Fix redirection to wiki when terms are declined

Adds missing test to pick this up.

Fixes #3826.

16 months agoRemove some old debugging comments
Andy Allan [Wed, 21 Dec 2022 12:05:15 +0000 (12:05 +0000)]
Remove some old debugging comments

16 months agoFix new rubocop warnings
Tom Hughes [Tue, 20 Dec 2022 18:57:12 +0000 (18:57 +0000)]
Fix new rubocop warnings

16 months agoUpdate bundle
Tom Hughes [Tue, 20 Dec 2022 18:55:04 +0000 (18:55 +0000)]
Update bundle

16 months agoMerge remote-tracking branch 'upstream/pull/3851'
Tom Hughes [Tue, 20 Dec 2022 18:51:14 +0000 (18:51 +0000)]
Merge remote-tracking branch 'upstream/pull/3851'

16 months agoBump eslint from 8.29.0 to 8.30.0
dependabot[bot] [Mon, 19 Dec 2022 23:00:39 +0000 (23:00 +0000)]
Bump eslint from 8.29.0 to 8.30.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.29.0 to 8.30.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.29.0...v8.30.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 agoFix resource names for Oauth 2 bottons
Tom Hughes [Sun, 18 Dec 2022 19:42:48 +0000 (19:42 +0000)]
Fix resource names for Oauth 2 bottons

Fixes #3850

16 months agoadded valhalla routing engine
Christian Beiwinkel [Fri, 16 Dec 2022 16:05:36 +0000 (17:05 +0100)]
added valhalla routing engine

16 months agorenamed fossgis engine
Christian Beiwinkel [Fri, 16 Dec 2022 15:57:14 +0000 (16:57 +0100)]
renamed fossgis engine

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Dec 2022 12:14:33 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoSet the tooltip on the edit tab after the locale is set
Tom Hughes [Wed, 14 Dec 2022 21:48:28 +0000 (21:48 +0000)]
Set the tooltip on the edit tab after the locale is set

Fixes #3839

16 months agoMerge pull request #3817 from LaoshuBaby/readme-translate-change
Andy Allan [Wed, 14 Dec 2022 16:39:56 +0000 (16:39 +0000)]
Merge pull request #3817 from LaoshuBaby/readme-translate-change

docs(README.md): add communities name translate guide

16 months agoRephrase the OCI description for clarity
Andy Allan [Wed, 14 Dec 2022 16:32:19 +0000 (16:32 +0000)]
Rephrase the OCI description for clarity

Where the list of chapters come from is of interest to developers,
beyond just in the context of i18n. So make this topic into its own
item, rather than a sub-part of the general translation item.

16 months agoMerge remote-tracking branch 'upstream/pull/3844'
Tom Hughes [Wed, 14 Dec 2022 15:48:09 +0000 (15:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3844'

16 months agoUse fallbacks for OCI resource names
Andy Allan [Wed, 14 Dec 2022 14:54:01 +0000 (14:54 +0000)]
Use fallbacks for OCI resource names

This uses the fallbacks for OCI translations. For example, if a
local chapter doesn't have an explicitly translated name, it will
use a template for osm-lc resources and fill in the appropriate
translated community name.

Fixes #3814

16 months agoFix new rubocop warnings
Tom Hughes [Tue, 13 Dec 2022 20:23:45 +0000 (20:23 +0000)]
Fix new rubocop warnings

16 months agoUpdate bundle
Tom Hughes [Tue, 13 Dec 2022 20:22:44 +0000 (20:22 +0000)]
Update bundle

16 months agoBump osm-community-index from 5.3.1 to 5.4.0
dependabot[bot] [Mon, 12 Dec 2022 23:00:42 +0000 (23:00 +0000)]
Bump osm-community-index from 5.3.1 to 5.4.0

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.3.1 to 5.4.0.
- [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.3.1...v5.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Dec 2022 12:12:45 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoAvoid duplicate initialisation warnings
Tom Hughes [Sat, 10 Dec 2022 15:33:49 +0000 (15:33 +0000)]
Avoid duplicate initialisation warnings

16 months agoFix eslint warnings
Tom Hughes [Fri, 9 Dec 2022 19:01:10 +0000 (19:01 +0000)]
Fix eslint warnings

16 months agoMerge remote-tracking branch 'upstream/pull/3606'
Tom Hughes [Fri, 9 Dec 2022 17:17:25 +0000 (17:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3606'

16 months agoRun tests on ubuntu 20.04 and 22.04 with ruby 3.1
Tom Hughes [Tue, 19 Jul 2022 16:13:09 +0000 (17:13 +0100)]
Run tests on ubuntu 20.04 and 22.04 with ruby 3.1

Ubuntu 22.04 actually uses ruby 3.0 but ruby/setup-ruby currently
only supports ruby 3.1 there so this is the best we can do.

16 months agoIncrease delay to improve test reliability
Tom Hughes [Fri, 9 Dec 2022 15:07:12 +0000 (15:07 +0000)]
Increase delay to improve test reliability

16 months agoSet secure flag for matomo cookies
Tom Hughes [Thu, 8 Dec 2022 22:45:02 +0000 (22:45 +0000)]
Set secure flag for matomo cookies

16 months agoAllow matomo cookie timeouts to be configured
Tom Hughes [Thu, 8 Dec 2022 22:24:22 +0000 (22:24 +0000)]
Allow matomo cookie timeouts to be configured

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Dec 2022 12:13:52 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoMerge remote-tracking branch 'upstream/pull/3832'
Tom Hughes [Thu, 8 Dec 2022 08:11:52 +0000 (08:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3832'

16 months agoBump nokogiri from 1.13.9 to 1.13.10
dependabot[bot] [Thu, 8 Dec 2022 03:40:24 +0000 (03:40 +0000)]
Bump nokogiri from 1.13.9 to 1.13.10

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.9...v1.13.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
16 months agoMerge remote-tracking branch 'upstream/pull/3830'
Tom Hughes [Wed, 7 Dec 2022 18:22:14 +0000 (18:22 +0000)]
Merge remote-tracking branch 'upstream/pull/3830'

16 months agoMerge remote-tracking branch 'upstream/pull/3828'
Tom Hughes [Wed, 7 Dec 2022 18:19:27 +0000 (18:19 +0000)]
Merge remote-tracking branch 'upstream/pull/3828'

16 months agoRemove tile_for_point SQL functions
Andy Allan [Wed, 7 Dec 2022 14:57:14 +0000 (14:57 +0000)]
Remove tile_for_point SQL functions

This removes both the pl/pgsql version and the shared library version
of the `tile_for_point` SQL function. This function was only used in some
old migrations, and is not required for production usage.

Removing this function simplifies the installation and configuration for
new developers.

These SQL functions are separate from the `tile_for_point` ruby/C function
which is part of the quad_tile gem. This function is still used when
creating and updating database records.

Fixes #3110.

16 months agoRemove fallback code for undefined history.pushState()
Anton Khorev [Wed, 7 Dec 2022 07:57:30 +0000 (10:57 +0300)]
Remove fallback code for undefined history.pushState()

16 months agoUpdate bundle
Tom Hughes [Tue, 6 Dec 2022 19:13:29 +0000 (19:13 +0000)]
Update bundle

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Dec 2022 12:12:45 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoOnly send user IDs to matomo when configured to do so
Tom Hughes [Sun, 4 Dec 2022 18:54:07 +0000 (18:54 +0000)]
Only send user IDs to matomo when configured to do so

16 months agoMerge remote-tracking branch 'upstream/pull/3821'
Tom Hughes [Sat, 3 Dec 2022 11:06:11 +0000 (11:06 +0000)]
Merge remote-tracking branch 'upstream/pull/3821'

16 months agoMerge remote-tracking branch 'upstream/pull/3825'
Tom Hughes [Sat, 3 Dec 2022 11:00:33 +0000 (11:00 +0000)]
Merge remote-tracking branch 'upstream/pull/3825'

16 months agoMerge remote-tracking branch 'upstream/pull/3822'
Tom Hughes [Sat, 3 Dec 2022 11:00:30 +0000 (11:00 +0000)]
Merge remote-tracking branch 'upstream/pull/3822'

16 months agoMerge remote-tracking branch 'upstream/pull/3126'
Tom Hughes [Sat, 3 Dec 2022 10:59:14 +0000 (10:59 +0000)]
Merge remote-tracking branch 'upstream/pull/3126'

16 months agoBump eslint from 8.28.0 to 8.29.0
dependabot[bot] [Fri, 2 Dec 2022 23:00:33 +0000 (23:00 +0000)]
Bump eslint from 8.28.0 to 8.29.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.28.0 to 8.29.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.28.0...v8.29.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 agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Dec 2022 12:13:32 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoBump leaflet.locatecontrol from 0.78.0 to 0.79.0
dependabot[bot] [Wed, 30 Nov 2022 23:00:42 +0000 (23:00 +0000)]
Bump leaflet.locatecontrol from 0.78.0 to 0.79.0

Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.78.0 to 0.79.0.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.78.0...v0.79.0)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
16 months agoAdd more testcases to changesets_controller
mmd-osm [Wed, 30 Nov 2022 21:18:59 +0000 (22:18 +0100)]
Add more testcases to changesets_controller

Extracted from pull request #1995

16 months agoMake tooltip tests more robust
Tom Hughes [Wed, 30 Nov 2022 12:58:13 +0000 (12:58 +0000)]
Make tooltip tests more robust

16 months agoMerge remote-tracking branch 'upstream/pull/3688'
Tom Hughes [Wed, 30 Nov 2022 12:19:57 +0000 (12:19 +0000)]
Merge remote-tracking branch 'upstream/pull/3688'

16 months agoMerge remote-tracking branch 'upstream/pull/3820'
Tom Hughes [Wed, 30 Nov 2022 12:06:24 +0000 (12:06 +0000)]
Merge remote-tracking branch 'upstream/pull/3820'

16 months agoUse mail_to help to avoid handcrafting mailto links
Andy Allan [Wed, 30 Nov 2022 11:06:41 +0000 (11:06 +0000)]
Use mail_to help to avoid handcrafting mailto links

This also reworks the user suspended page to avoid having html in
the translation strings.

16 months agoUpdate bundle
Tom Hughes [Tue, 29 Nov 2022 18:08:49 +0000 (18:08 +0000)]
Update bundle

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 28 Nov 2022 12:12:01 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.

17 months agofix(README.md): typo and grammar
快乐的老鼠宝宝 [Thu, 24 Nov 2022 16:20:40 +0000 (00:20 +0800)]
fix(README.md): typo and grammar

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 24 Nov 2022 12:13:38 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

17 months agodocs(README.md): add communities name translate guide
快乐的老鼠宝宝 [Thu, 24 Nov 2022 09:04:46 +0000 (17:04 +0800)]
docs(README.md): add communities name translate guide

In https://github.com/openstreetmap/openstreetmap-website/issues/3653 and https://github.com/openstreetmap/openstreetmap-website/issues/3814 noticed that communities name listed in https://www.openstreetmap.org/communities can't found in TranslateWiki

17 months agoMerge pull request #3676 from harry-wood/notes-disappear-time
Andy Allan [Wed, 23 Nov 2022 15:44:26 +0000 (15:44 +0000)]
Merge pull request #3676 from harry-wood/notes-disappear-time

Display how long until a note will disappear

17 months agoUpdate node modules
Tom Hughes [Tue, 22 Nov 2022 18:50:35 +0000 (18:50 +0000)]
Update node modules

17 months agoMerge remote-tracking branch 'upstream/pull/3301'
Tom Hughes [Tue, 22 Nov 2022 18:47:24 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/3301'

17 months agoFix new rubocop warnings
Tom Hughes [Tue, 22 Nov 2022 18:32:02 +0000 (18:32 +0000)]
Fix new rubocop warnings

17 months agoUpdate bundle
Tom Hughes [Tue, 22 Nov 2022 18:16:22 +0000 (18:16 +0000)]
Update bundle

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 21 Nov 2022 12:11:49 +0000 (13:11 +0100)]
Localisation updates from https://translatewiki.net.

17 months agoMerge remote-tracking branch 'upstream/pull/3809'
Tom Hughes [Sun, 20 Nov 2022 18:31:04 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/3809'

17 months agoMerge remote-tracking branch 'upstream/pull/3808'
Tom Hughes [Sun, 20 Nov 2022 18:31:02 +0000 (18:31 +0000)]
Merge remote-tracking branch 'upstream/pull/3808'

17 months agoBump leaflet from 1.9.2 to 1.9.3
dependabot[bot] [Fri, 18 Nov 2022 23:01:18 +0000 (23:01 +0000)]
Bump leaflet from 1.9.2 to 1.9.3

Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Leaflet/Leaflet/compare/v1.9.2...v1.9.3)

---
updated-dependencies:
- dependency-name: leaflet
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
17 months agoBump eslint from 8.27.0 to 8.28.0
dependabot[bot] [Fri, 18 Nov 2022 23:01:12 +0000 (23:01 +0000)]
Bump eslint from 8.27.0 to 8.28.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.27.0 to 8.28.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.27.0...v8.28.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
17 months agoMerge remote-tracking branch 'upstream/pull/3805'
Tom Hughes [Thu, 17 Nov 2022 17:51:46 +0000 (17:51 +0000)]
Merge remote-tracking branch 'upstream/pull/3805'

17 months agoMerge remote-tracking branch 'upstream/pull/3804'
Tom Hughes [Thu, 17 Nov 2022 17:49:58 +0000 (17:49 +0000)]
Merge remote-tracking branch 'upstream/pull/3804'

17 months agoMerge remote-tracking branch 'upstream/pull/3803'
Tom Hughes [Thu, 17 Nov 2022 17:49:17 +0000 (17:49 +0000)]
Merge remote-tracking branch 'upstream/pull/3803'

17 months agoUse the mail_to method to construct a mailto link for browse tag values
Andy Allan [Thu, 17 Nov 2022 12:51:55 +0000 (12:51 +0000)]
Use the mail_to method to construct a mailto link for browse tag values

This is easier than building a mailto link ourselves. Also implement
the missing title tag and write a test for it.

17 months agoEnable more brakeman checks
Andy Allan [Thu, 17 Nov 2022 12:15:02 +0000 (12:15 +0000)]
Enable more brakeman checks

These have been refactored already, so no longer need to be skipped.

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Nov 2022 12:12:56 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.

17 months agoCreate a second title_user translation, to avoid using html_safe
Andy Allan [Thu, 17 Nov 2022 12:10:49 +0000 (12:10 +0000)]
Create a second title_user translation, to avoid using html_safe

17 months agoReconfigure the suspended flash message to avoid html_safe
Andy Allan [Thu, 17 Nov 2022 12:01:45 +0000 (12:01 +0000)]
Reconfigure the suspended flash message to avoid html_safe

This also avoids having raw html in the translation strings

17 months agoMerge remote-tracking branch 'upstream/pull/3798'
Tom Hughes [Wed, 16 Nov 2022 18:33:51 +0000 (18:33 +0000)]
Merge remote-tracking branch 'upstream/pull/3798'

17 months agoMerge remote-tracking branch 'upstream/pull/3797'
Tom Hughes [Wed, 16 Nov 2022 18:16:09 +0000 (18:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3797'

17 months agoMerge remote-tracking branch 'upstream/pull/3799'
Tom Hughes [Wed, 16 Nov 2022 18:14:38 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3799'

17 months agoMerge remote-tracking branch 'upstream/pull/3800'
Tom Hughes [Wed, 16 Nov 2022 18:12:29 +0000 (18:12 +0000)]
Merge remote-tracking branch 'upstream/pull/3800'

17 months agoMerge pull request #3779 from AntonKhorev/spinner
Andy Allan [Wed, 16 Nov 2022 16:22:18 +0000 (16:22 +0000)]
Merge pull request #3779 from AntonKhorev/spinner

Replace searching.gif images with Bootstrap spinners

17 months agoUse rails 7.0 configuration defaults
Andy Allan [Wed, 16 Nov 2022 15:29:30 +0000 (15:29 +0000)]
Use rails 7.0 configuration defaults

All the entries in the new framework defaults were enabled a while
ago, apart from the cookies serializer which is already defined in
config/initializers/cookies_serializer.rb

17 months agoRelax strict version constraint on rails gem
Andy Allan [Wed, 16 Nov 2022 14:26:05 +0000 (14:26 +0000)]
Relax strict version constraint on rails gem

This lets us receive 7.0.x patch releases without having to edit the Gemfile.

17 months agoPass original event instad of leaflet event to changeset bbox click simulation
Anton Khorev [Wed, 16 Nov 2022 12:45:27 +0000 (15:45 +0300)]
Pass original event instad of leaflet event to changeset bbox click simulation

17 months agoMinor documentation tweaks
Andy Allan [Wed, 16 Nov 2022 12:19:12 +0000 (12:19 +0000)]
Minor documentation tweaks

Prefer 'you' to 'one' since 'you' is used throughout the documentation and is easier for non-native speakers.