]> git.openstreetmap.org Git - rails.git/log
rails.git
4 months agoMerge remote-tracking branch 'upstream/pull/5086'
Tom Hughes [Fri, 16 Aug 2024 16:22:59 +0000 (17:22 +0100)]
Merge remote-tracking branch 'upstream/pull/5086'

4 months agoMerge remote-tracking branch 'upstream/pull/5087'
Tom Hughes [Fri, 16 Aug 2024 16:20:33 +0000 (17:20 +0100)]
Merge remote-tracking branch 'upstream/pull/5087'

4 months agoMerge remote-tracking branch 'upstream/pull/5085'
Tom Hughes [Fri, 16 Aug 2024 16:19:23 +0000 (17:19 +0100)]
Merge remote-tracking branch 'upstream/pull/5085'

4 months agoTruncate long usernames in blocks tables
Anton Khorev [Fri, 16 Aug 2024 11:41:02 +0000 (14:41 +0300)]
Truncate long usernames in blocks tables

4 months agoAdd navigation tabs to edit block pages
Anton Khorev [Fri, 16 Aug 2024 10:27:10 +0000 (13:27 +0300)]
Add navigation tabs to edit block pages

4 months agoRemove duration and needs_view inputs from inactive block edit form
Anton Khorev [Fri, 16 Aug 2024 10:00:19 +0000 (13:00 +0300)]
Remove duration and needs_view inputs from inactive block edit form

4 months agoMerge remote-tracking branch 'upstream/pull/5081'
Tom Hughes [Thu, 15 Aug 2024 16:54:51 +0000 (17:54 +0100)]
Merge remote-tracking branch 'upstream/pull/5081'

4 months agoMerge remote-tracking branch 'upstream/pull/5082'
Tom Hughes [Thu, 15 Aug 2024 16:53:47 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/5082'

4 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Aug 2024 12:15:24 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

4 months agoPrevent reactivating inactive blocks
Anton Khorev [Thu, 15 Aug 2024 09:59:49 +0000 (12:59 +0300)]
Prevent reactivating inactive blocks

4 months agoRename geocodeCallback to changeCallback, call it from latlon setValue
Anton Khorev [Sun, 11 Aug 2024 03:47:38 +0000 (06:47 +0300)]
Rename geocodeCallback to changeCallback, call it from latlon setValue

endpoint.setValue always calls changeCallback on its successful completion, with geocoding or without. This allows to decide when to call getRoute entirely from callbacks and event listeners.

4 months agoMerge remote-tracking branch 'upstream/pull/5072'
Tom Hughes [Wed, 14 Aug 2024 18:12:59 +0000 (19:12 +0100)]
Merge remote-tracking branch 'upstream/pull/5072'

4 months agoMerge remote-tracking branch 'upstream/pull/5075'
Tom Hughes [Wed, 14 Aug 2024 18:06:42 +0000 (19:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5075'

4 months agoMerge remote-tracking branch 'upstream/pull/5078'
Tom Hughes [Wed, 14 Aug 2024 18:02:07 +0000 (19:02 +0100)]
Merge remote-tracking branch 'upstream/pull/5078'

4 months agoMerge remote-tracking branch 'upstream/pull/5074'
Tom Hughes [Wed, 14 Aug 2024 18:01:05 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/5074'

4 months agoMerge remote-tracking branch 'upstream/pull/5073'
Tom Hughes [Wed, 14 Aug 2024 18:00:20 +0000 (19:00 +0100)]
Merge remote-tracking branch 'upstream/pull/5073'

4 months agoMerge remote-tracking branch 'upstream/pull/5076'
Tom Hughes [Wed, 14 Aug 2024 17:57:05 +0000 (18:57 +0100)]
Merge remote-tracking branch 'upstream/pull/5076'

4 months agoAdd ruby 3.3 to test matrix
Tom Hughes [Wed, 14 Aug 2024 17:51:29 +0000 (18:51 +0100)]
Add ruby 3.3 to test matrix

4 months agoMonkey patch GD2::AnimatedGif to fix the finalizer
Tom Hughes [Wed, 14 Aug 2024 17:19:24 +0000 (18:19 +0100)]
Monkey patch GD2::AnimatedGif to fix the finalizer

https://github.com/dark-panda/gd2-ffij/pull/27

4 months agoAdd article:published_time meta tag to diary entries
Anton Khorev [Wed, 14 Aug 2024 14:59:00 +0000 (17:59 +0300)]
Add article:published_time meta tag to diary entries

4 months agoAdd debug gem
Andy Allan [Wed, 14 Aug 2024 14:36:09 +0000 (15:36 +0100)]
Add debug gem

This is included in new rails 7+ apps, so let's include it too.

This also means it's available on ruby 3.0, and is automatically
updated on newer versions of ruby too.

4 months agoSwitch to edit pane if rich text field validation fails
Anton Khorev [Wed, 14 Aug 2024 13:43:57 +0000 (16:43 +0300)]
Switch to edit pane if rich text field validation fails

Allows the "Please fill out this field" message to be visible.

4 months agoMerge pull request #5056 from AntonKhorev/diary-og-description
Andy Allan [Wed, 14 Aug 2024 13:38:28 +0000 (14:38 +0100)]
Merge pull request #5056 from AntonKhorev/diary-og-description

Set og:description meta tag to diary entry description

4 months agoRename user blocks system test class
Anton Khorev [Wed, 14 Aug 2024 12:57:44 +0000 (15:57 +0300)]
Rename user blocks system test class

4 months agoRemove unused xml_parse method
Anton Khorev [Wed, 14 Aug 2024 02:58:17 +0000 (05:58 +0300)]
Remove unused xml_parse method

4 months agoMake setLatLng a private function
Anton Khorev [Sun, 11 Aug 2024 02:31:48 +0000 (05:31 +0300)]
Make setLatLng a private function

4 months agoDon't set input value from endpoint.setLatLng()
Anton Khorev [Sun, 11 Aug 2024 02:29:33 +0000 (05:29 +0300)]
Don't set input value from endpoint.setLatLng()

This input value computed from coordinates is not always used. endpoint.getGeocode() overwrites it immediately.

4 months agoDon't call endpoint.setLatLng() from outside of endpoint module
Anton Khorev [Sun, 11 Aug 2024 02:13:36 +0000 (05:13 +0300)]
Don't call endpoint.setLatLng() from outside of endpoint module

4 months agoMerge remote-tracking branch 'upstream/pull/5067'
Tom Hughes [Tue, 13 Aug 2024 17:46:25 +0000 (18:46 +0100)]
Merge remote-tracking branch 'upstream/pull/5067'

4 months agoUpdate bundle
Tom Hughes [Tue, 13 Aug 2024 17:11:12 +0000 (18:11 +0100)]
Update bundle

4 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Aug 2024 12:15:31 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

4 months agoUse content box sizing instead of negative margins
Anton Khorev [Mon, 12 Aug 2024 00:21:21 +0000 (03:21 +0300)]
Use content box sizing instead of negative margins

4 months agoSet layer button size in rems
Anton Khorev [Mon, 12 Aug 2024 00:02:48 +0000 (03:02 +0300)]
Set layer button size in rems

Lets buttons become larger if font-only zoom is used. This should help with layer name labels not fitting.

4 months agoMerge remote-tracking branch 'upstream/pull/5062'
Tom Hughes [Sun, 11 Aug 2024 18:04:18 +0000 (19:04 +0100)]
Merge remote-tracking branch 'upstream/pull/5062'

4 months agoMerge remote-tracking branch 'upstream/pull/5061'
Tom Hughes [Sun, 11 Aug 2024 17:56:28 +0000 (18:56 +0100)]
Merge remote-tracking branch 'upstream/pull/5061'

4 months agoMove endpoints code to its own module
Anton Khorev [Sat, 10 Aug 2024 03:19:32 +0000 (06:19 +0300)]
Move endpoints code to its own module

4 months agoRename route request variable
Anton Khorev [Sat, 10 Aug 2024 03:01:35 +0000 (06:01 +0300)]
Rename route request variable

It's not boolean, the comment was outdated.

4 months agoRemove references to global variables from endpoint drag listener
Anton Khorev [Sat, 10 Aug 2024 02:53:59 +0000 (05:53 +0300)]
Remove references to global variables from endpoint drag listener

This causes visible input value updates even when the route is not recalculated. The upside is that it lets endpoints not know about the route and its update state.

4 months agoBump eslint from 9.8.0 to 9.9.0
dependabot[bot] [Fri, 9 Aug 2024 23:32:40 +0000 (23:32 +0000)]
Bump eslint from 9.8.0 to 9.9.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.8.0 to 9.9.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/v9.8.0...v9.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
4 months agoMerge remote-tracking branch 'upstream/pull/5059'
Tom Hughes [Thu, 8 Aug 2024 16:59:41 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/pull/5059'

4 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Aug 2024 12:15:22 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

4 months agoSet min preview height when switching away from edit tab
Anton Khorev [Thu, 8 Aug 2024 03:48:13 +0000 (06:48 +0300)]
Set min preview height when switching away from edit tab

Previously it was set when switching to a preview tab. Now that won't work correctly because we have one extra tab.

4 months agoSwitch away from help tab when help sidebar becomes visible
Anton Khorev [Thu, 8 Aug 2024 03:30:35 +0000 (06:30 +0300)]
Switch away from help tab when help sidebar becomes visible

4 months agoMove help card between pane/sidebar depending on sidebar visibility
Anton Khorev [Thu, 8 Aug 2024 03:28:55 +0000 (06:28 +0300)]
Move help card between pane/sidebar depending on sidebar visibility

4 months agoAdd richtext help tab
Anton Khorev [Thu, 8 Aug 2024 01:48:57 +0000 (04:48 +0300)]
Add richtext help tab

4 months agoUse closest() instead of parents() when looking for richtext container
Anton Khorev [Thu, 8 Aug 2024 03:07:42 +0000 (06:07 +0300)]
Use closest() instead of parents() when looking for richtext container

4 months agoRemove unused richtext dom ids
Anton Khorev [Thu, 8 Aug 2024 00:33:46 +0000 (03:33 +0300)]
Remove unused richtext dom ids

4 months agoRemove .richtext_preview css class
Anton Khorev [Thu, 8 Aug 2024 02:56:06 +0000 (05:56 +0300)]
Remove .richtext_preview css class

4 months agoRemove .richtext_content css class
Anton Khorev [Thu, 8 Aug 2024 00:20:57 +0000 (03:20 +0300)]
Remove .richtext_content css class

4 months agoRemove .richtext_dopreview css class
Anton Khorev [Thu, 8 Aug 2024 00:16:50 +0000 (03:16 +0300)]
Remove .richtext_dopreview css class

4 months agoMerge remote-tracking branch 'upstream/pull/5055'
Tom Hughes [Wed, 7 Aug 2024 17:40:40 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/5055'

4 months agoMerge remote-tracking branch 'upstream/pull/5054'
Tom Hughes [Wed, 7 Aug 2024 17:38:09 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5054'

4 months agoMerge remote-tracking branch 'upstream/pull/5053'
Tom Hughes [Wed, 7 Aug 2024 17:37:17 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/5053'

4 months agoSet og:description meta tag to diary entry description
Anton Khorev [Wed, 7 Aug 2024 05:33:41 +0000 (08:33 +0300)]
Set og:description meta tag to diary entry description

4 months agoSet OpenGraph properties hash in diary entry show action
Anton Khorev [Wed, 7 Aug 2024 05:18:43 +0000 (08:18 +0300)]
Set OpenGraph properties hash in diary entry show action

4 months agoPass properties hash to OpenGraph helper
Anton Khorev [Wed, 7 Aug 2024 05:13:29 +0000 (08:13 +0300)]
Pass properties hash to OpenGraph helper

4 months agoRemove default argument values of OpenGraph tag helper
Anton Khorev [Wed, 7 Aug 2024 15:55:08 +0000 (18:55 +0300)]
Remove default argument values of OpenGraph tag helper

4 months agoMerge pull request #5019 from tomhughes/oauth2-cleanup
Andy Allan [Wed, 7 Aug 2024 15:22:21 +0000 (16:22 +0100)]
Merge pull request #5019 from tomhughes/oauth2-cleanup

Add expiry for OAuth 2 grants and tokens

4 months agoMerge pull request #5044 from mmd-osm/patch/rn1
Andy Allan [Wed, 7 Aug 2024 15:12:53 +0000 (16:12 +0100)]
Merge pull request #5044 from mmd-osm/patch/rn1

JSON partial rendering in loop

4 months agoSkip paragraphs with no text when looking for richtext description
Anton Khorev [Wed, 7 Aug 2024 04:46:10 +0000 (07:46 +0300)]
Skip paragraphs with no text when looking for richtext description

4 months agoTruncate long richtext descriptions
Anton Khorev [Wed, 7 Aug 2024 03:53:43 +0000 (06:53 +0300)]
Truncate long richtext descriptions

4 months agoDetect <p> as richtext paragraph
Anton Khorev [Wed, 7 Aug 2024 03:09:38 +0000 (06:09 +0300)]
Detect <p> as richtext paragraph

4 months agoUse first paragraph as richtext description
Anton Khorev [Wed, 7 Aug 2024 03:06:10 +0000 (06:06 +0300)]
Use first paragraph as richtext description

4 months agoAdd a blank richtext description method
Anton Khorev [Wed, 7 Aug 2024 02:27:28 +0000 (05:27 +0300)]
Add a blank richtext description method

4 months agoDon't order by id when getting last records
Anton Khorev [Wed, 7 Aug 2024 02:08:27 +0000 (05:08 +0300)]
Don't order by id when getting last records

4 months agoRedirect to newly created diary comment
Anton Khorev [Wed, 7 Aug 2024 01:59:09 +0000 (04:59 +0300)]
Redirect to newly created diary comment

4 months agoLock note during status update to avoid race condition
mmd-osm [Tue, 6 Aug 2024 17:51:48 +0000 (19:51 +0200)]
Lock note during status update to avoid race condition

4 months agoMerge remote-tracking branch 'upstream/pull/5051'
Tom Hughes [Tue, 6 Aug 2024 17:35:36 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/5051'

4 months agoMerge remote-tracking branch 'upstream/pull/5050'
Tom Hughes [Tue, 6 Aug 2024 17:33:35 +0000 (18:33 +0100)]
Merge remote-tracking branch 'upstream/pull/5050'

4 months agoMerge remote-tracking branch 'upstream/pull/5049'
Tom Hughes [Tue, 6 Aug 2024 17:30:27 +0000 (18:30 +0100)]
Merge remote-tracking branch 'upstream/pull/5049'

4 months agoMerge remote-tracking branch 'upstream/pull/5046'
Tom Hughes [Tue, 6 Aug 2024 17:29:25 +0000 (18:29 +0100)]
Merge remote-tracking branch 'upstream/pull/5046'

4 months agoUpdate bundle
Tom Hughes [Tue, 6 Aug 2024 17:08:04 +0000 (18:08 +0100)]
Update bundle

4 months agoRefactor copypasted invalid node attribute test code
Anton Khorev [Tue, 6 Aug 2024 03:26:03 +0000 (06:26 +0300)]
Refactor copypasted invalid node attribute test code

4 months agoDon't use XML::Parser when testing changeset upload diffResults
Anton Khorev [Tue, 6 Aug 2024 02:31:26 +0000 (05:31 +0300)]
Don't use XML::Parser when testing changeset upload diffResults

4 months agoAlways check the order when testing changeset queries
Anton Khorev [Tue, 6 Aug 2024 01:08:18 +0000 (04:08 +0300)]
Always check the order when testing changeset queries

4 months agoMerge branch 'pull/5045'
Anton Khorev [Mon, 5 Aug 2024 23:26:41 +0000 (02:26 +0300)]
Merge branch 'pull/5045'

4 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Aug 2024 12:14:59 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

4 months agoSet og:image:alt OpenGraph property
Anton Khorev [Fri, 2 Aug 2024 15:48:04 +0000 (18:48 +0300)]
Set og:image:alt OpenGraph property

4 months agoAdd image_alt accessor to rich text
Anton Khorev [Thu, 1 Aug 2024 16:46:08 +0000 (19:46 +0300)]
Add image_alt accessor to rich text

4 months agoUsers: avoid calling json.partial! in loop
mmd-osm [Sun, 4 Aug 2024 19:50:07 +0000 (21:50 +0200)]
Users: avoid calling json.partial! in loop

4 months agoNotes: avoid calling json.partial! in loop
mmd-osm [Sun, 4 Aug 2024 19:49:38 +0000 (21:49 +0200)]
Notes: avoid calling json.partial! in loop

4 months agoChangeset: avoid XML rendering in loop
mmd-osm [Sun, 4 Aug 2024 20:35:48 +0000 (22:35 +0200)]
Changeset: avoid XML rendering in loop

4 months agoMessages: avoid calling json.partial! in loop
mmd-osm [Sun, 4 Aug 2024 19:49:07 +0000 (21:49 +0200)]
Messages: avoid calling json.partial! in loop

4 months agoChangesets: avoid calling json.partial! in loop
mmd-osm [Sun, 4 Aug 2024 19:48:09 +0000 (21:48 +0200)]
Changesets: avoid calling json.partial! in loop

4 months agoMerge branch 'pull/5023'
Anton Khorev [Sun, 4 Aug 2024 15:46:25 +0000 (18:46 +0300)]
Merge branch 'pull/5023'

4 months agoMerge remote-tracking branch 'upstream/pull/5042'
Tom Hughes [Sun, 4 Aug 2024 11:36:27 +0000 (12:36 +0100)]
Merge remote-tracking branch 'upstream/pull/5042'

4 months agoMerge remote-tracking branch 'upstream/pull/5041'
Tom Hughes [Sun, 4 Aug 2024 11:35:20 +0000 (12:35 +0100)]
Merge remote-tracking branch 'upstream/pull/5041'

4 months agoSwitch between richtext edit/preview using Bootstrap tab panes
Anton Khorev [Fri, 7 Jun 2024 14:48:05 +0000 (17:48 +0300)]
Switch between richtext edit/preview using Bootstrap tab panes

4 months agoConvert richtext edit/preview buttons into tabs
Anton Khorev [Fri, 7 Jun 2024 14:38:03 +0000 (17:38 +0300)]
Convert richtext edit/preview buttons into tabs

4 months agoChange richtext edit/preview buttons type to non-submit
Anton Khorev [Sat, 3 Aug 2024 00:41:43 +0000 (03:41 +0300)]
Change richtext edit/preview buttons type to non-submit

4 months agoSkip images with missing src
Anton Khorev [Fri, 2 Aug 2024 17:19:10 +0000 (20:19 +0300)]
Skip images with missing src

4 months agoDetect <img> images in markdown rich text
Anton Khorev [Fri, 2 Aug 2024 17:01:52 +0000 (20:01 +0300)]
Detect <img> images in markdown rich text

4 months agoMerge remote-tracking branch 'upstream/pull/5040'
Tom Hughes [Fri, 2 Aug 2024 06:06:22 +0000 (07:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5040'

4 months agoMerge remote-tracking branch 'upstream/pull/5039'
Tom Hughes [Fri, 2 Aug 2024 06:06:19 +0000 (07:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5039'

4 months agoBump rexml from 3.3.2 to 3.3.3
dependabot[bot] [Fri, 2 Aug 2024 02:10:30 +0000 (02:10 +0000)]
Bump rexml from 3.3.2 to 3.3.3

Bumps [rexml](https://github.com/ruby/rexml) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.2...v3.3.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
4 months agoBump qs from 6.12.3 to 6.13.0
dependabot[bot] [Thu, 1 Aug 2024 23:37:07 +0000 (23:37 +0000)]
Bump qs from 6.12.3 to 6.13.0

Bumps [qs](https://github.com/ljharb/qs) from 6.12.3 to 6.13.0.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.12.3...v6.13.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
4 months agoMerge remote-tracking branch 'upstream/pull/5037'
Tom Hughes [Thu, 1 Aug 2024 17:26:46 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/5037'

4 months agoMerge remote-tracking branch 'upstream/pull/5036'
Tom Hughes [Thu, 1 Aug 2024 17:25:26 +0000 (18:25 +0100)]
Merge remote-tracking branch 'upstream/pull/5036'

4 months agoTest plaintext trace emails
Anton Khorev [Thu, 1 Aug 2024 16:07:00 +0000 (19:07 +0300)]
Test plaintext trace emails

4 months agoTest tags with &-encoded characters in trace emails
Anton Khorev [Thu, 1 Aug 2024 16:02:16 +0000 (19:02 +0300)]
Test tags with &-encoded characters in trace emails