]> git.openstreetmap.org Git - rails.git/log
rails.git
20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Feb 2023 12:13:40 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

20 months agoMerge pull request #3691 from AntonKhorev/wikipedia-secondary-links
Andy Allan [Wed, 8 Feb 2023 17:30:25 +0000 (17:30 +0000)]
Merge pull request #3691 from AntonKhorev/wikipedia-secondary-links

Link prefixed wikipedia tags

20 months agoUpdate bundle
Tom Hughes [Tue, 7 Feb 2023 18:22:50 +0000 (18:22 +0000)]
Update bundle

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Feb 2023 12:15:08 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Feb 2023 12:14:55 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoMerge remote-tracking branch 'upstream/pull/3911'
Tom Hughes [Wed, 1 Feb 2023 19:10:22 +0000 (19:10 +0000)]
Merge remote-tracking branch 'upstream/pull/3911'

21 months agoMerge remote-tracking branch 'upstream/pull/3915'
Tom Hughes [Wed, 1 Feb 2023 19:07:09 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3915'

21 months agoAvoid converting conditional restriction tags into emails
Andy Allan [Wed, 1 Feb 2023 18:57:16 +0000 (18:57 +0000)]
Avoid converting conditional restriction tags into emails

Fixes #3884

21 months agoRefactor to use submit_tag helper
Andy Allan [Wed, 1 Feb 2023 17:01:32 +0000 (17:01 +0000)]
Refactor to use submit_tag helper

This is more readable than interpolating into element attributes

21 months agoRefactor translation strings for notes
Andy Allan [Thu, 26 Jan 2023 11:36:09 +0000 (11:36 +0000)]
Refactor translation strings for notes

These aren't used by any javascript code, so don't need to be in
the `javascripts` key.

21 months agoUse data attributes to pass alternative button labels
Andy Allan [Wed, 1 Feb 2023 15:30:57 +0000 (15:30 +0000)]
Use data attributes to pass alternative button labels

This allows the text to be defined in the html partials, instead
of looking up the i18n via javascript.

21 months agoMove browse#note to notes#show
Andy Allan [Wed, 25 Jan 2023 21:46:35 +0000 (21:46 +0000)]
Move browse#note to notes#show

This allows a more resourceful routing approach.

21 months agoMove browse#new_note to notes#new
Andy Allan [Wed, 25 Jan 2023 19:22:10 +0000 (19:22 +0000)]
Move browse#new_note to notes#new

This allows a more resourceful routing approach.

21 months agoUpdate bundle
Tom Hughes [Tue, 31 Jan 2023 18:09:09 +0000 (18:09 +0000)]
Update bundle

21 months agoMerge remote-tracking branch 'upstream/pull/3913'
Tom Hughes [Tue, 31 Jan 2023 18:07:24 +0000 (18:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3913'

21 months agoBump eslint from 8.32.0 to 8.33.0
dependabot[bot] [Mon, 30 Jan 2023 23:00:40 +0000 (23:00 +0000)]
Bump eslint from 8.32.0 to 8.33.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.32.0 to 8.33.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.32.0...v8.33.0)

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

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

21 months agoUpdate to rails 7.0.4.2
Tom Hughes [Thu, 26 Jan 2023 18:06:57 +0000 (18:06 +0000)]
Update to rails 7.0.4.2

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Jan 2023 12:17:10 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoSort issues in descending order of their last update
Tom Hughes [Thu, 26 Jan 2023 09:04:37 +0000 (09:04 +0000)]
Sort issues in descending order of their last update

21 months agoRename api_notes resource to avoid conflict with non-API resource
Andy Allan [Wed, 25 Jan 2023 19:01:57 +0000 (19:01 +0000)]
Rename api_notes resource to avoid conflict with non-API resource

This allows using e.g. note_path for notes#show in the future.

21 months agoMerge remote-tracking branch 'upstream/pull/3908'
Tom Hughes [Wed, 25 Jan 2023 12:15:41 +0000 (12:15 +0000)]
Merge remote-tracking branch 'upstream/pull/3908'

21 months agoUpdate to iD v2.24.1
Martin Raifer [Wed, 25 Jan 2023 11:59:54 +0000 (12:59 +0100)]
Update to iD v2.24.1

21 months agoMerge remote-tracking branch 'upstream/pull/3905'
Tom Hughes [Tue, 24 Jan 2023 18:28:27 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/pull/3905'

21 months agoFix new rubocop warnings
Tom Hughes [Tue, 24 Jan 2023 18:19:30 +0000 (18:19 +0000)]
Fix new rubocop warnings

21 months agoUpdate bundle
Tom Hughes [Tue, 24 Jan 2023 18:13:02 +0000 (18:13 +0000)]
Update bundle

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

21 months agoUpdate to iD v2.24.0
Martin Raifer [Thu, 19 Jan 2023 15:04:52 +0000 (16:04 +0100)]
Update to iD v2.24.0

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Jan 2023 12:16:50 +0000 (13:16 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoUpdate to rails 7.0.4.1
Tom Hughes [Tue, 17 Jan 2023 19:29:30 +0000 (19:29 +0000)]
Update to rails 7.0.4.1

21 months agoMerge remote-tracking branch 'upstream/pull/3898'
Tom Hughes [Tue, 17 Jan 2023 18:38:03 +0000 (18:38 +0000)]
Merge remote-tracking branch 'upstream/pull/3898'

21 months agoUpdate bundle
Tom Hughes [Tue, 17 Jan 2023 18:37:43 +0000 (18:37 +0000)]
Update bundle

21 months agoBump eslint from 8.31.0 to 8.32.0
dependabot[bot] [Mon, 16 Jan 2023 23:00:52 +0000 (23:00 +0000)]
Bump eslint from 8.31.0 to 8.32.0

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

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

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

21 months agoUpdate tests for changes in osm-community-index
Tom Hughes [Sat, 14 Jan 2023 15:12:23 +0000 (15:12 +0000)]
Update tests for changes in osm-community-index

21 months agoMerge remote-tracking branch 'upstream/pull/3893'
Tom Hughes [Sat, 14 Jan 2023 14:49:18 +0000 (14:49 +0000)]
Merge remote-tracking branch 'upstream/pull/3893'

21 months agoBump osm-community-index from 5.4.0 to 5.5.0
dependabot[bot] [Fri, 13 Jan 2023 23:00:43 +0000 (23:00 +0000)]
Bump osm-community-index from 5.4.0 to 5.5.0

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.4.0 to 5.5.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.4.0...v5.5.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>
21 months agoDrop version constraint on mail and update bundle
Tom Hughes [Fri, 13 Jan 2023 09:29:04 +0000 (09:29 +0000)]
Drop version constraint on mail and update bundle

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Jan 2023 12:15:28 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoMerge remote-tracking branch 'upstream/pull/3891'
Tom Hughes [Wed, 11 Jan 2023 18:42:16 +0000 (18:42 +0000)]
Merge remote-tracking branch 'upstream/pull/3891'

21 months agoMerge remote-tracking branch 'upstream/pull/3890'
Tom Hughes [Wed, 11 Jan 2023 15:38:36 +0000 (15:38 +0000)]
Merge remote-tracking branch 'upstream/pull/3890'

21 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

21 months agoMove more api-related helper methods to ApiController
Andy Allan [Wed, 11 Jan 2023 15:28:59 +0000 (15:28 +0000)]
Move more api-related helper methods to ApiController

This prevents them from being inadvertently used in non-API controllers

21 months agoUse web_timeout for notes controller
Andy Allan [Wed, 11 Jan 2023 15:28:02 +0000 (15:28 +0000)]
Use web_timeout for notes controller

This controller doesn't handle any API methods, and so the api call
error handling isn't appropriate.

21 months agoUse bin/yarn consistently for installations
Andy Allan [Wed, 11 Jan 2023 11:26:35 +0000 (11:26 +0000)]
Use bin/yarn consistently for installations

Since rails 7, the `rails yarn:install` command no longer uses
bin/yarn and so a) doesn't detect yarn binaries named "yarnpkg"
(e.g. Ubuntu) and b) doesn't allow us to pass any flags to yarn,
(e.g. "--ignore-engines").

Since we want to avoid making the installation more difficult (by
e.g. installing yarn from other sources, or requiring particular
node versions) we can instead just use our existing bin/yarn script.

The reason Dockerfile did its own thing was to avoid pulling in
big chunks of rails, but bin/yarn is a standalone ruby script.

Fixes #3579

21 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

21 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'

21 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

21 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

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

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

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

Fixes #3877

21 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

21 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

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

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

22 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

22 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

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

22 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

22 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'

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

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

22 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'

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

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

22 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

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

22 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

22 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'

22 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

22 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

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

22 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

22 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

22 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

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

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

22 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'

22 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

22 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"

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

22 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

22 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

22 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

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

22 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

22 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

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

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

22 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'

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

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

22 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'

22 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'

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

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

22 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

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