]> git.openstreetmap.org Git - rails.git/log
rails.git
23 months agoMerge pull request #3878 from tomhughes/issues-offline
Andy Allan [Wed, 11 Jan 2023 15:36:40 +0000 (15:36 +0000)]
Merge pull request #3878 from tomhughes/issues-offline

Add database checks to issue and report controllers

23 months agoAdd database checks to issue and report controllers
Tom Hughes [Sat, 7 Jan 2023 15:20:22 +0000 (15:20 +0000)]
Add database checks to issue and report controllers

Fixes #3875

23 months agoMerge remote-tracking branch 'upstream/pull/3886'
Tom Hughes [Wed, 11 Jan 2023 10:57:04 +0000 (10:57 +0000)]
Merge remote-tracking branch 'upstream/pull/3886'

23 months agoMerge pull request #3889 from tomhughes/distances
Andy Allan [Wed, 11 Jan 2023 10:47:19 +0000 (10:47 +0000)]
Merge pull request #3889 from tomhughes/distances

Make distances in directions translatable

23 months agoMake distances in directions translatable
Tom Hughes [Tue, 10 Jan 2023 20:58:10 +0000 (20:58 +0000)]
Make distances in directions translatable

Fixes #3888

23 months agoUpdate bundle
Tom Hughes [Tue, 10 Jan 2023 18:40:52 +0000 (18:40 +0000)]
Update bundle

23 months agoRemove Geonames and geocoder.ca
Richard Fairhurst [Mon, 9 Jan 2023 21:23:48 +0000 (21:23 +0000)]
Remove Geonames and geocoder.ca

23 months agoMake error pages translatable
Tom Hughes [Sat, 7 Jan 2023 15:39:27 +0000 (15:39 +0000)]
Make error pages translatable

Fixes #3877

23 months agoMerge pull request #3885 from tomhughes/diary-new
Andy Allan [Mon, 9 Jan 2023 19:07:04 +0000 (19:07 +0000)]
Merge pull request #3885 from tomhughes/diary-new

Fix some translation issues for diary_entry#new

23 months agoFix some translation issues for diary_entry#new
Tom Hughes [Mon, 9 Jan 2023 19:02:11 +0000 (19:02 +0000)]
Fix some translation issues for diary_entry#new

Fixes #3880

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Jan 2023 12:28:11 +0000 (13:28 +0100)]
Localisation updates from https://translatewiki.net.

23 months agoMake sanitize convert text alignment styles to bootstrap classes
Tom Hughes [Mon, 9 Jan 2023 11:10:11 +0000 (11:10 +0000)]
Make sanitize convert text alignment styles to bootstrap classes

The kramdown converter for markdown uses inline styles for table
column alignment which gets lost when we strip the styles so add
bootstrap classes to replace it.

23 months agoMerge pull request #3874 from tomhughes/offline
Andy Allan [Fri, 6 Jan 2023 13:10:28 +0000 (13:10 +0000)]
Merge pull request #3874 from tomhughes/offline

Allow models to load when the database is offline

23 months agoAllow models to load when the database is offline
Tom Hughes [Thu, 5 Jan 2023 19:51:01 +0000 (19:51 +0000)]
Allow models to load when the database is offline

It used to be necessary to stop ActiveRecord loading because
it would immediately try and connect the database but with the
introduction of switchable database connections it now only connects
when a model is used for the first time.

Fixes #3858

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Jan 2023 12:20:08 +0000 (13:20 +0100)]
Localisation updates from https://translatewiki.net.

23 months agoEscape each portion of a semicolon seprated value individually
Tom Hughes [Wed, 4 Jan 2023 15:41:54 +0000 (15:41 +0000)]
Escape each portion of a semicolon seprated value individually

Fixes #3872

23 months agoMerge remote-tracking branch 'upstream/pull/3868'
Tom Hughes [Tue, 3 Jan 2023 19:20:31 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/pull/3868'

23 months agoUpdate rubocop todo
Tom Hughes [Tue, 3 Jan 2023 19:13:14 +0000 (19:13 +0000)]
Update rubocop todo

23 months agoUpdate bundle
Tom Hughes [Tue, 3 Jan 2023 19:08:51 +0000 (19:08 +0000)]
Update bundle

23 months agoMerge remote-tracking branch 'upstream/pull/3871'
Tom Hughes [Tue, 3 Jan 2023 19:07:34 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3871'

23 months agoBump eslint from 8.30.0 to 8.31.0
dependabot[bot] [Mon, 2 Jan 2023 23:00:37 +0000 (23:00 +0000)]
Bump eslint from 8.30.0 to 8.31.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.30.0 to 8.31.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.30.0...v8.31.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Jan 2023 12:14:32 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

23 months agofix formatting
Kyle Hensel [Sun, 1 Jan 2023 23:50:37 +0000 (12:50 +1300)]
fix formatting

23 months agoMerge pull request #3870 from Dimitar5555/patch-1
Andy Allan [Sun, 1 Jan 2023 15:35:38 +0000 (15:35 +0000)]
Merge pull request #3870 from Dimitar5555/patch-1

Added missing `</p>` tag

23 months agoAdded missing `</p>` tag
Dimitar [Sun, 1 Jan 2023 14:06:41 +0000 (16:06 +0200)]
Added missing `</p>` tag

23 months agofix formatting of tag values with semicolon-separated URLs
Kyle Hensel [Sat, 31 Dec 2022 03:37:29 +0000 (16:37 +1300)]
fix formatting of tag values with semicolon-separated URLs

23 months agoMerge remote-tracking branch 'upstream/pull/3863'
Tom Hughes [Fri, 30 Dec 2022 11:48:49 +0000 (11:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3863'

23 months agoAdd an entry for translation issues to the issue template
Tom Hughes [Fri, 30 Dec 2022 10:55:44 +0000 (10:55 +0000)]
Add an entry for translation issues to the issue template

23 months agoupdate-wiki-pages: process KeyPrefixDescription template
mmd-osm [Fri, 30 Dec 2022 07:37:19 +0000 (08:37 +0100)]
update-wiki-pages: process KeyPrefixDescription template

23 months agoUpdate wiki_pages.yml
mmd-osm [Wed, 28 Dec 2022 15:17:09 +0000 (16:17 +0100)]
Update wiki_pages.yml

23 months agoPreserve rel=me on links in rich text
Tom Hughes [Thu, 29 Dec 2022 17:58:22 +0000 (17:58 +0000)]
Preserve rel=me on links in rich text

Fixes #3859

23 months agoUse CGI.escape for ruby 2.7 compatibility
Tom Hughes [Thu, 29 Dec 2022 17:45:29 +0000 (17:45 +0000)]
Use CGI.escape for ruby 2.7 compatibility

23 months agoRequire integer IDs for diary_entries#show
Tom Hughes [Thu, 29 Dec 2022 17:14:05 +0000 (17:14 +0000)]
Require integer IDs for diary_entries#show

Fixes #3865

23 months agoUpdate bundle
Tom Hughes [Thu, 29 Dec 2022 16:53:25 +0000 (16:53 +0000)]
Update bundle

23 months agoMake test names clearer
Tom Hughes [Thu, 29 Dec 2022 16:52:19 +0000 (16:52 +0000)]
Make test names clearer

23 months agoMerge remote-tracking branch 'upstream/pull/3862'
Tom Hughes [Thu, 29 Dec 2022 16:51:53 +0000 (16:51 +0000)]
Merge remote-tracking branch 'upstream/pull/3862'

23 months agoMerge pull request #3864 from ZhengLin-Li/patch-1
Andy Allan [Thu, 29 Dec 2022 10:35:07 +0000 (10:35 +0000)]
Merge pull request #3864 from ZhengLin-Li/patch-1

Change Save to Comment

23 months agoChange Save to Comment
ZhengLin Li [Thu, 29 Dec 2022 10:03:02 +0000 (02:03 -0800)]
Change Save to Comment

For comment submit buttons we currently have:

"Comment" (Changeset Comments)
"Add Comment" (Issue Comments)
"Comment" (Note Comments)
"Save" (Diary Comments)

So, to make them consistent, I'd propose to change "Save" to "Comment"

23 months agoAdd tests to ensure tokens are revoked
Andy Allan [Wed, 28 Dec 2022 15:14:31 +0000 (15:14 +0000)]
Add tests to ensure tokens are revoked

This ensures that tokens are revoked or invalidated when a user
is soft destroyed.

23 months agoupdate-wiki-pages: adding retry and timeout
mmd-osm [Wed, 28 Dec 2022 15:16:49 +0000 (16:16 +0100)]
update-wiki-pages: adding retry and timeout

23 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

23 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

23 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.

23 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

23 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

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

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

2 years 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'

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

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

2 years 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'

2 years 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'

2 years 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.

2 years 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.

2 years 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

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

2 years 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

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

2 years 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.

2 years 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'

2 years 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.

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

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

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

2 years 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'

2 years 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>
2 years 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

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

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

2 years 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.

2 years 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

2 years 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

2 years 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.

2 years 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'

2 years 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

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

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

2 years 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>
2 years 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.

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

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

2 years 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'

2 years 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.

2 years 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

2 years 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

2 years 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

2 years 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.

2 years 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'

2 years 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>
2 years 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'

2 years 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'

2 years 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.

2 years 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()

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

2 years 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.

2 years 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

2 years 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'

2 years 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'

2 years 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'

2 years 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'