]> git.openstreetmap.org Git - rails.git/log
rails.git
11 months agoMerge remote-tracking branch 'upstream/pull/4383'
Tom Hughes [Sun, 3 Dec 2023 18:32:54 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4383'

11 months agoMerge remote-tracking branch 'upstream/pull/4385'
Tom Hughes [Sun, 3 Dec 2023 18:32:34 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/pull/4385'

11 months agoBump eslint from 8.54.0 to 8.55.0
dependabot[bot] [Fri, 1 Dec 2023 23:08:06 +0000 (23:08 +0000)]
Bump eslint from 8.54.0 to 8.55.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.55.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.54.0...v8.55.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
11 months agoMake mapnik map key for lakes visible on all zoom levels
Anton Khorev [Thu, 30 Nov 2023 23:10:14 +0000 (02:10 +0300)]
Make mapnik map key for lakes visible on all zoom levels

11 months agoMerge remote-tracking branch 'upstream/pull/4381'
Tom Hughes [Thu, 30 Nov 2023 17:56:24 +0000 (17:56 +0000)]
Merge remote-tracking branch 'upstream/pull/4381'

11 months agoFix mapnik map key for roads
Anton Khorev [Thu, 30 Nov 2023 16:12:34 +0000 (19:12 +0300)]
Fix mapnik map key for roads

The main changes are:
- no roads on zooms < 6
- no yellow-colored secondary highways without casing

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 Nov 2023 12:18:45 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoMerge remote-tracking branch 'upstream/pull/4378'
Tom Hughes [Wed, 29 Nov 2023 12:49:32 +0000 (12:49 +0000)]
Merge remote-tracking branch 'upstream/pull/4378'

11 months agoUse 5 meter radius for input locations in Valhalla
Nils [Wed, 29 Nov 2023 12:06:41 +0000 (13:06 +0100)]
Use 5 meter radius for input locations in Valhalla

This will search for road segments within 5 meter radius of the input location and choose the best path from/to whichever segment gives the cheapest cost. It should be preferable in most scenarios compared to simply snapping to the closest segment.

I'll do the same PR for our web app at https://github.com/gis-ops/valhalla-app.

12 months agoMerge remote-tracking branch 'upstream/pull/4329'
Tom Hughes [Tue, 28 Nov 2023 22:21:50 +0000 (22:21 +0000)]
Merge remote-tracking branch 'upstream/pull/4329'

12 months agoMerge remote-tracking branch 'upstream/pull/4374'
Tom Hughes [Tue, 28 Nov 2023 18:43:45 +0000 (18:43 +0000)]
Merge remote-tracking branch 'upstream/pull/4374'

12 months agoMerge remote-tracking branch 'upstream/pull/4373'
Tom Hughes [Tue, 28 Nov 2023 18:37:48 +0000 (18:37 +0000)]
Merge remote-tracking branch 'upstream/pull/4373'

12 months agoUpdate expected response for doorkeeper errors
Tom Hughes [Tue, 28 Nov 2023 18:35:11 +0000 (18:35 +0000)]
Update expected response for doorkeeper errors

12 months agoAllow FactoryBot to set primary key attributes
Tom Hughes [Tue, 28 Nov 2023 18:25:35 +0000 (18:25 +0000)]
Allow FactoryBot to set primary key attributes

We have at least model (Language) which does not use datbase
generated primary keys so we need to be able to set them.

https://github.com/thoughtbot/factory_bot_rails/pull/419

12 months agoUpdate bundle
Tom Hughes [Tue, 28 Nov 2023 18:18:17 +0000 (18:18 +0000)]
Update bundle

12 months agoMerge remote-tracking branch 'upstream/pull/4352'
Tom Hughes [Tue, 28 Nov 2023 18:11:40 +0000 (18:11 +0000)]
Merge remote-tracking branch 'upstream/pull/4352'

12 months agoStart summit mapnik map key at zoom 11
Anton Khorev [Mon, 27 Nov 2023 14:02:58 +0000 (17:02 +0300)]
Start summit mapnik map key at zoom 11

12 months agoStart dashed rail line mapnik map key at zoom 12
Anton Khorev [Mon, 27 Nov 2023 13:51:38 +0000 (16:51 +0300)]
Start dashed rail line mapnik map key at zoom 12

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

12 months agoMerge remote-tracking branch 'upstream/pull/4368'
Tom Hughes [Sun, 26 Nov 2023 19:01:20 +0000 (19:01 +0000)]
Merge remote-tracking branch 'upstream/pull/4368'

12 months agoMerge remote-tracking branch 'upstream/pull/4367'
Tom Hughes [Sun, 26 Nov 2023 18:57:16 +0000 (18:57 +0000)]
Merge remote-tracking branch 'upstream/pull/4367'

12 months agoMerge remote-tracking branch 'upstream/pull/4366'
Tom Hughes [Sun, 26 Nov 2023 18:56:05 +0000 (18:56 +0000)]
Merge remote-tracking branch 'upstream/pull/4366'

12 months agoRead layers with available map key from config/key.yml
Anton Khorev [Fri, 24 Nov 2023 13:38:38 +0000 (16:38 +0300)]
Read layers with available map key from config/key.yml

12 months agoAdd tooltip to disabled html share button
Anton Khorev [Fri, 24 Nov 2023 13:00:45 +0000 (16:00 +0300)]
Add tooltip to disabled html share button

12 months agoDisable html share button for tracestracktopo layer
Anton Khorev [Fri, 24 Nov 2023 12:12:41 +0000 (15:12 +0300)]
Disable html share button for tracestracktopo layer

12 months agoDrop ACL check from notes#comment as we no longer allow anonymous comments
Tom Hughes [Thu, 23 Nov 2023 16:47:35 +0000 (16:47 +0000)]
Drop ACL check from notes#comment as we no longer allow anonymous comments

12 months agoPrevent unauthenticated users commenting on notes via the API
Tom Hughes [Thu, 23 Nov 2023 16:46:36 +0000 (16:46 +0000)]
Prevent unauthenticated users commenting on notes via the API

12 months agoRemove unused css for lists inside primary nav on narrow screens
Anton Khorev [Thu, 23 Nov 2023 16:52:51 +0000 (19:52 +0300)]
Remove unused css for lists inside primary nav on narrow screens

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

12 months agoMerge pull request #4296 from AntonKhorev/header-flex
Andy Allan [Wed, 22 Nov 2023 17:22:46 +0000 (17:22 +0000)]
Merge pull request #4296 from AntonKhorev/header-flex

Use flex container instead of floats in header

12 months agoMerge pull request #4353 from tomhughes/rtlcss
Andy Allan [Wed, 22 Nov 2023 17:13:35 +0000 (17:13 +0000)]
Merge pull request #4353 from tomhughes/rtlcss

Improve handling of RTL styling

12 months agoMerge pull request #4313 from AntonKhorev/account-delete-delay
Andy Allan [Wed, 22 Nov 2023 15:07:34 +0000 (15:07 +0000)]
Merge pull request #4313 from AntonKhorev/account-delete-delay

Account deletion cool-down period

12 months agoDisallow account deletion after confirmation
Anton Khorev [Tue, 24 Oct 2023 18:20:19 +0000 (21:20 +0300)]
Disallow account deletion after confirmation

12 months agoDisable delete account button if there are recent changesets
Anton Khorev [Tue, 24 Oct 2023 17:06:06 +0000 (20:06 +0300)]
Disable delete account button if there are recent changesets

12 months agoAdd earliest allowed deletion time to user model
Anton Khorev [Tue, 24 Oct 2023 17:42:23 +0000 (20:42 +0300)]
Add earliest allowed deletion time to user model

12 months agoAdd user account deletion delay test helper
Anton Khorev [Tue, 24 Oct 2023 17:57:25 +0000 (20:57 +0300)]
Add user account deletion delay test helper

12 months agoAdd user account deletion delay setting
Anton Khorev [Wed, 25 Oct 2023 11:09:03 +0000 (14:09 +0300)]
Add user account deletion delay setting

12 months agoPrevent API tokens without write_notes creating attributed comments
Tom Hughes [Wed, 22 Nov 2023 12:30:39 +0000 (12:30 +0000)]
Prevent API tokens without write_notes creating attributed comments

Fixes #4362

12 months agoFix dependency
Tom Hughes [Tue, 21 Nov 2023 17:26:23 +0000 (17:26 +0000)]
Fix dependency

12 months agoMerge remote-tracking branch 'upstream/pull/4358'
Tom Hughes [Tue, 21 Nov 2023 17:24:19 +0000 (17:24 +0000)]
Merge remote-tracking branch 'upstream/pull/4358'

12 months agoMerge remote-tracking branch 'upstream/pull/4356'
Tom Hughes [Tue, 21 Nov 2023 17:22:21 +0000 (17:22 +0000)]
Merge remote-tracking branch 'upstream/pull/4356'

12 months agoUpdate bundle
Tom Hughes [Tue, 21 Nov 2023 16:59:17 +0000 (16:59 +0000)]
Update bundle

12 months agoDo not merge zoom/lat/lon options with oauth_return_url
Milan Cvetkovic [Tue, 21 Nov 2023 13:01:52 +0000 (13:01 +0000)]
Do not merge zoom/lat/lon options with oauth_return_url

12 months agoExtract `welcome_options` function to simplify save function
Milan Cvetkovic [Mon, 6 Nov 2023 18:05:30 +0000 (18:05 +0000)]
Extract `welcome_options` function to simplify save function

12 months agoWelcome screen works with confirmation email too
Milan Cvetkovic [Mon, 6 Nov 2023 14:21:44 +0000 (14:21 +0000)]
Welcome screen works with confirmation email too

12 months agoWelcome screen displays 'Continue with authorization'
Milan Cvetkovic [Mon, 6 Nov 2023 13:16:49 +0000 (13:16 +0000)]
Welcome screen displays 'Continue with authorization'

do not hide notes

12 months agoRemove 'need to return bbox' comment on conditions_bbox
Anton Khorev [Tue, 21 Nov 2023 10:55:35 +0000 (13:55 +0300)]
Remove 'need to return bbox' comment on conditions_bbox

12 months agoRemove 'basic attributes' comments from changeset api output builders
Anton Khorev [Mon, 20 Nov 2023 12:39:27 +0000 (15:39 +0300)]
Remove 'basic attributes' comments from changeset api output builders

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

12 months agoForce rubygems 3.4.10 for github actions
Tom Hughes [Fri, 17 Nov 2023 14:52:48 +0000 (14:52 +0000)]
Force rubygems 3.4.10 for github actions

This works around a problem where mini_racer doesn't like the psych
in the GitHub Actions images for ruby 3.0 and 3.1 but it fine with
the ruby 3.2 image that uses a newer rubygems version.

https://github.com/rubyjs/mini_racer/issues/289

12 months agoBump eslint from 8.53.0 to 8.54.0
dependabot[bot] [Fri, 17 Nov 2023 23:02:11 +0000 (23:02 +0000)]
Bump eslint from 8.53.0 to 8.54.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.53.0 to 8.54.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.53.0...v8.54.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
12 months agoFix tiny user thumbnail size at 25x25 px
Anton Khorev [Fri, 17 Nov 2023 09:45:20 +0000 (12:45 +0300)]
Fix tiny user thumbnail size at 25x25 px

12 months agoDisable text wrapping while measuring header width
Anton Khorev [Tue, 17 Oct 2023 19:58:59 +0000 (22:58 +0300)]
Disable text wrapping while measuring header width

12 months agoSwitch to flex header container
Anton Khorev [Mon, 16 Oct 2023 17:27:38 +0000 (20:27 +0300)]
Switch to flex header container

12 months agoFix positioning of placeholder text in RTL mode
Tom Hughes [Thu, 16 Nov 2023 22:52:30 +0000 (22:52 +0000)]
Fix positioning of placeholder text in RTL mode

Fixes #3910

12 months agoUse rtlcss instead of r2 for RTL support
Tom Hughes [Thu, 16 Nov 2023 22:25:13 +0000 (22:25 +0000)]
Use rtlcss instead of r2 for RTL support

This ensures that the RTL directives in bootstrap are processed
correctly as it is designed around RTLCSS for RTL support.

Fixes #4347

12 months agoMerge remote-tracking branch 'upstream/pull/4351'
Tom Hughes [Thu, 16 Nov 2023 13:43:46 +0000 (13:43 +0000)]
Merge remote-tracking branch 'upstream/pull/4351'

12 months agoMerge remote-tracking branch 'upstream/pull/4350'
Tom Hughes [Thu, 16 Nov 2023 13:43:44 +0000 (13:43 +0000)]
Merge remote-tracking branch 'upstream/pull/4350'

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

12 months agoUpdate oauth configuration url input label
Anton Khorev [Thu, 16 Nov 2023 10:05:45 +0000 (13:05 +0300)]
Update oauth configuration url input label

12 months agoRemove save user step when configuring permissions
Anton Khorev [Thu, 16 Nov 2023 09:08:18 +0000 (12:08 +0300)]
Remove save user step when configuring permissions

12 months agoHash passwords as soon as a new user is created
Tom Hughes [Thu, 16 Nov 2023 00:54:56 +0000 (00:54 +0000)]
Hash passwords as soon as a new user is created

12 months agoPreserve pass_crypt_confirmation in the new user hash
Tom Hughes [Thu, 16 Nov 2023 00:29:49 +0000 (00:29 +0000)]
Preserve pass_crypt_confirmation in the new user hash

12 months agoMerge remote-tracking branch 'upstream/pull/4349'
Tom Hughes [Wed, 15 Nov 2023 22:30:41 +0000 (22:30 +0000)]
Merge remote-tracking branch 'upstream/pull/4349'

12 months agoMerge pull request #4348 from tomhughes/native-enum
Andy Allan [Wed, 15 Nov 2023 19:56:04 +0000 (19:56 +0000)]
Merge pull request #4348 from tomhughes/native-enum

Switch to using native rails support for managing Postgres enumerations

12 months agoUnderline time elements that have a title
Andy Allan [Wed, 15 Nov 2023 19:46:43 +0000 (19:46 +0000)]
Underline time elements that have a title

This replicates the previous use of abbr tags, with improved semantics.

Although we only use time tags in one place at the moment, the attribute
filter protects against any usage in the future that doesn't need a title
indication.

12 months agoSimplify date display by using friendly_date helpers
Andy Allan [Wed, 15 Nov 2023 19:46:10 +0000 (19:46 +0000)]
Simplify date display by using friendly_date helpers

12 months agoAvoid wrapping friendly_date with abbr tags
Andy Allan [Wed, 15 Nov 2023 19:45:48 +0000 (19:45 +0000)]
Avoid wrapping friendly_date with abbr tags

12 months agoUse friendly_date helpers for revoking user blocks
Andy Allan [Wed, 15 Nov 2023 19:44:10 +0000 (19:44 +0000)]
Use friendly_date helpers for revoking user blocks

12 months agoUse friendly_date for note disappear description
Andy Allan [Wed, 15 Nov 2023 19:36:35 +0000 (19:36 +0000)]
Use friendly_date for note disappear description

There's no need to reimplement this in its own helper.

12 months agoUse the friendly_data_ago helper for contacts on the dashboard
Andy Allan [Wed, 15 Nov 2023 19:21:51 +0000 (19:21 +0000)]
Use the friendly_data_ago helper for contacts on the dashboard

Also take the opportunity to fix the translation key.

12 months agoUse time instead of abbr element for changesets_helper
Andy Allan [Wed, 15 Nov 2023 19:19:57 +0000 (19:19 +0000)]
Use time instead of abbr element for changesets_helper

12 months agoAvoid wrapping time tags in abbr for note_helper
Andy Allan [Wed, 15 Nov 2023 19:18:01 +0000 (19:18 +0000)]
Avoid wrapping time tags in abbr for note_helper

12 months agoAdd missing tests for friendly_date_ago helper
Andy Allan [Wed, 15 Nov 2023 19:16:18 +0000 (19:16 +0000)]
Add missing tests for friendly_date_ago helper

12 months agoSwitch to using native rails support for managing Postgres enumerations
Tom Hughes [Wed, 15 Nov 2023 18:19:54 +0000 (18:19 +0000)]
Switch to using native rails support for managing Postgres enumerations

12 months agoUse html 'time' element for friendly date helpers
Andy Allan [Wed, 15 Nov 2023 17:53:38 +0000 (17:53 +0000)]
Use html 'time' element for friendly date helpers

This provides more structure than just a simple span.

12 months agoMerge remote-tracking branch 'upstream/pull/4319'
Tom Hughes [Wed, 15 Nov 2023 17:14:49 +0000 (17:14 +0000)]
Merge remote-tracking branch 'upstream/pull/4319'

12 months agoMerge pull request #4333 from mapmeld/rtl-on-tag-values
Andy Allan [Wed, 15 Nov 2023 16:05:46 +0000 (16:05 +0000)]
Merge pull request #4333 from mapmeld/rtl-on-tag-values

Format right-to-left and bi-di text in OSM tag values

12 months agoFormat right-to-left and bi-di text in OSM tag values
Nick Doiron [Wed, 8 Nov 2023 18:23:35 +0000 (12:23 -0600)]
Format right-to-left and bi-di text in OSM tag values

12 months agoMerge pull request #4311 from tomhughes/query-locales
Andy Allan [Wed, 15 Nov 2023 15:34:28 +0000 (15:34 +0000)]
Merge pull request #4311 from tomhughes/query-locales

Improve name selection with the query tool

12 months agoMerge remote-tracking branch 'upstream/pull/4346'
Tom Hughes [Wed, 15 Nov 2023 15:18:40 +0000 (15:18 +0000)]
Merge remote-tracking branch 'upstream/pull/4346'

12 months agoRemove global text-align declarations
Andy Allan [Wed, 15 Nov 2023 15:08:23 +0000 (15:08 +0000)]
Remove global text-align declarations

These interfere with directions set in `dir` attributes, e.g. `dir='auto'`.

The corresponding text-align was removed in Bootstrap 5.

Fixes #3432.

12 months agoMerge pull request #4318 from tomhughes/rails-71-defaults
Andy Allan [Wed, 15 Nov 2023 11:48:18 +0000 (11:48 +0000)]
Merge pull request #4318 from tomhughes/rails-71-defaults

Enable remaining rails 7.1 defaults

12 months agoImprove name selection with the query tool
Tom Hughes [Tue, 24 Oct 2023 16:19:32 +0000 (17:19 +0100)]
Improve name selection with the query tool

Pass the full expanded list of preferred languages to the client
and use that when looking for the best name for an object.

Fixes #4310

12 months agoMerge remote-tracking branch 'upstream/pull/4297'
Tom Hughes [Tue, 14 Nov 2023 17:19:54 +0000 (17:19 +0000)]
Merge remote-tracking branch 'upstream/pull/4297'

12 months agoRemove some tag table custom css
Anton Khorev [Wed, 18 Oct 2023 12:19:25 +0000 (15:19 +0300)]
Remove some tag table custom css

12 months agoMerge remote-tracking branch 'upstream/pull/4345'
Tom Hughes [Tue, 14 Nov 2023 15:40:03 +0000 (15:40 +0000)]
Merge remote-tracking branch 'upstream/pull/4345'

12 months agoUpdate bundle
Tom Hughes [Tue, 14 Nov 2023 15:37:38 +0000 (15:37 +0000)]
Update bundle

12 months agoRemove $spacer css from browse status panel
Anton Khorev [Tue, 14 Nov 2023 05:37:05 +0000 (08:37 +0300)]
Remove $spacer css from browse status panel

12 months agoRemove $spacer css from sidebar content
Anton Khorev [Tue, 14 Nov 2023 05:22:43 +0000 (08:22 +0300)]
Remove $spacer css from sidebar content

12 months agoUpdate to rails 7.1.2
Tom Hughes [Mon, 13 Nov 2023 22:10:55 +0000 (22:10 +0000)]
Update to rails 7.1.2

12 months agoMerge remote-tracking branch 'upstream/pull/4343'
Tom Hughes [Mon, 13 Nov 2023 18:44:16 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/4343'

12 months agoMerge remote-tracking branch 'upstream/pull/4342'
Tom Hughes [Mon, 13 Nov 2023 18:42:46 +0000 (18:42 +0000)]
Merge remote-tracking branch 'upstream/pull/4342'

12 months agoMerge remote-tracking branch 'upstream/pull/4341'
Tom Hughes [Mon, 13 Nov 2023 18:40:55 +0000 (18:40 +0000)]
Merge remote-tracking branch 'upstream/pull/4341'

12 months agoMerge remote-tracking branch 'upstream/pull/4340'
Tom Hughes [Mon, 13 Nov 2023 18:39:32 +0000 (18:39 +0000)]
Merge remote-tracking branch 'upstream/pull/4340'

12 months agoMerge remote-tracking branch 'upstream/pull/4339'
Tom Hughes [Mon, 13 Nov 2023 18:35:13 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/4339'

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

12 months agoRemove custom css and large left margin for map noscript message
Anton Khorev [Mon, 13 Nov 2023 09:24:51 +0000 (12:24 +0300)]
Remove custom css and large left margin for map noscript message

12 months agoRemove unused maximiseMap/minimiseMap functions
Anton Khorev [Mon, 13 Nov 2023 08:13:56 +0000 (11:13 +0300)]
Remove unused maximiseMap/minimiseMap functions

12 months agoRemove some custom css for pages with embedded iD
Anton Khorev [Mon, 13 Nov 2023 07:46:17 +0000 (10:46 +0300)]
Remove some custom css for pages with embedded iD