]> git.openstreetmap.org Git - rails.git/log
rails.git
13 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

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

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

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

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

13 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

13 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

13 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

13 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

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

13 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

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

13 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

13 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

13 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

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

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

13 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

13 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

13 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

13 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

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

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

13 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

13 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

13 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

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

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

13 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

13 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

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

13 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

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

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

13 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

13 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

13 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

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

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

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

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

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

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

13 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

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

13 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

13 months agoRemove custom css and unnecessary div nesting of welcome panel
Anton Khorev [Mon, 13 Nov 2023 07:05:35 +0000 (10:05 +0300)]
Remove custom css and unnecessary div nesting of welcome panel

13 months agoRemove relative position from sidebar child divs other than banners
Anton Khorev [Mon, 13 Nov 2023 06:46:11 +0000 (09:46 +0300)]
Remove relative position from sidebar child divs other than banners

13 months agoMerge remote-tracking branch 'upstream/pull/4336'
Tom Hughes [Sun, 12 Nov 2023 14:26:02 +0000 (14:26 +0000)]
Merge remote-tracking branch 'upstream/pull/4336'

13 months agoSet banner close button background/opacity with Bootstrap
Anton Khorev [Sun, 12 Nov 2023 07:17:06 +0000 (10:17 +0300)]
Set banner close button background/opacity with Bootstrap

13 months agoUse dark theme to invert banner close button
Anton Khorev [Sun, 12 Nov 2023 07:13:48 +0000 (10:13 +0300)]
Use dark theme to invert banner close button

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

13 months agoUse the URL safe base64 variant for mail tokens
Tom Hughes [Wed, 8 Nov 2023 22:53:18 +0000 (22:53 +0000)]
Use the URL safe base64 variant for mail tokens

13 months agoAdd secrets to gitignore
Tom Hughes [Wed, 8 Nov 2023 19:02:49 +0000 (19:02 +0000)]
Add secrets to gitignore

13 months agoMerge remote-tracking branch 'upstream/pull/4331'
Tom Hughes [Wed, 8 Nov 2023 18:22:50 +0000 (18:22 +0000)]
Merge remote-tracking branch 'upstream/pull/4331'

13 months agouse api.openstreetmap.org for API calls when running on www.osm.org
Martin Raifer [Wed, 8 Nov 2023 11:41:30 +0000 (12:41 +0100)]
use api.openstreetmap.org for API calls when running on www.osm.org

see https://github.com/openstreetmap/operations/issues/951

13 months agoUpdate to iD v2.27.3
Martin Raifer [Wed, 8 Nov 2023 11:23:21 +0000 (12:23 +0100)]
Update to iD v2.27.3

13 months agoStrengthen the tokens used in email reply addresses
Tom Hughes [Tue, 7 Nov 2023 10:31:57 +0000 (10:31 +0000)]
Strengthen the tokens used in email reply addresses

13 months agoRemove production credentials from the repository
Tom Hughes [Tue, 7 Nov 2023 10:18:04 +0000 (10:18 +0000)]
Remove production credentials from the repository

These (well master.key at least) should never have been here
but fortunately we haven't really been using them.

13 months agoUse secure_compare to compare passwords and tokens
Tom Hughes [Tue, 7 Nov 2023 17:16:21 +0000 (17:16 +0000)]
Use secure_compare to compare passwords and tokens

It's unlikely there is an explotable attack here given than network
latencies and variability will swamp any local timing differences but
it's best practice and there's no reason not to.

13 months agoMerge remote-tracking branch 'upstream/pull/4322'
Tom Hughes [Tue, 7 Nov 2023 17:07:28 +0000 (17:07 +0000)]
Merge remote-tracking branch 'upstream/pull/4322'

13 months agoUpdate bundle
Tom Hughes [Tue, 7 Nov 2023 17:00:22 +0000 (17:00 +0000)]
Update bundle

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

13 months agoBump eslint from 8.52.0 to 8.53.0
dependabot[bot] [Fri, 3 Nov 2023 23:35:24 +0000 (23:35 +0000)]
Bump eslint from 8.52.0 to 8.53.0

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

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

Signed-off-by: dependabot[bot] <support@github.com>
13 months agoMerge pull request #4321 from HolgerJeromin/patch-1
Andy Allan [Fri, 3 Nov 2023 15:00:35 +0000 (15:00 +0000)]
Merge pull request #4321 from HolgerJeromin/patch-1

fix link to stateofthemap.africa

13 months agofix link to stateofthemap.africa
Holger Jeromin [Fri, 3 Nov 2023 14:54:24 +0000 (15:54 +0100)]
fix link to stateofthemap.africa

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

13 months agoFix eslint warnings
Tom Hughes [Thu, 2 Nov 2023 10:11:36 +0000 (10:11 +0000)]
Fix eslint warnings

13 months agoMake change set comment rate limit errors display properly
Tom Hughes [Thu, 2 Nov 2023 10:08:19 +0000 (10:08 +0000)]
Make change set comment rate limit errors display properly

Fixes #4320

13 months agoUse postgres 14 for docker
Tom Hughes [Mon, 30 Oct 2023 22:29:48 +0000 (22:29 +0000)]
Use postgres 14 for docker

13 months agoAdd tests for API change rate limits
Tom Hughes [Sun, 29 Oct 2023 19:21:23 +0000 (19:21 +0000)]
Add tests for API change rate limits

13 months agoEnforce rate limit for API calls which make changes
Tom Hughes [Sun, 29 Oct 2023 16:11:23 +0000 (16:11 +0000)]
Enforce rate limit for API calls which make changes

13 months agoAdd support for per-user limits on the rate changes can be made
Tom Hughes [Sun, 29 Oct 2023 15:58:03 +0000 (15:58 +0000)]
Add support for per-user limits on the rate changes can be made

13 months agoAdd importer role that can be associated with higher rate limits
Tom Hughes [Sun, 29 Oct 2023 15:34:12 +0000 (15:34 +0000)]
Add importer role that can be associated with higher rate limits

13 months agoOnly count new reports as active for rate limits
Tom Hughes [Thu, 2 Nov 2023 08:44:43 +0000 (08:44 +0000)]
Only count new reports as active for rate limits

13 months agoFix new rubocop warnings
Tom Hughes [Tue, 31 Oct 2023 18:16:46 +0000 (18:16 +0000)]
Fix new rubocop warnings

13 months agoUpdate bundle
Tom Hughes [Tue, 31 Oct 2023 18:11:57 +0000 (18:11 +0000)]
Update bundle

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

13 months agoAvoid storing user records in the session during signup
Tom Hughes [Sat, 28 Oct 2023 11:00:57 +0000 (12:00 +0100)]
Avoid storing user records in the session during signup

This works around an issue with rails failing to preserve attribute
change flags and is in line with upstream advice against storing models
in the session in this way.

https://github.com/rails/rails/issues/49826
https://github.com/rails/rails/issues/49827

13 months agoSwitch to rails 7.1 defaults
Tom Hughes [Fri, 27 Oct 2023 16:59:35 +0000 (17:59 +0100)]
Switch to rails 7.1 defaults

13 months agoChange log level for DebugExceptions to error
Tom Hughes [Fri, 27 Oct 2023 16:55:24 +0000 (17:55 +0100)]
Change log level for DebugExceptions to error

13 months agoUse an HTML5 parser for tests
Tom Hughes [Fri, 27 Oct 2023 16:50:46 +0000 (17:50 +0100)]
Use an HTML5 parser for tests

13 months agoUse an HTML5 standards-compliant sanitizer
Tom Hughes [Fri, 27 Oct 2023 16:46:58 +0000 (17:46 +0100)]
Use an HTML5 standards-compliant sanitizer

13 months agoCommit transactions exited by return, break or throw
Tom Hughes [Fri, 27 Oct 2023 16:42:23 +0000 (17:42 +0100)]
Commit transactions exited by return, break or throw

13 months agoEnable optimisation of checks for parent record existence
Tom Hughes [Fri, 27 Oct 2023 16:38:21 +0000 (17:38 +0100)]
Enable optimisation of checks for parent record existence

13 months agoLimit log file size in development and test
Tom Hughes [Fri, 27 Oct 2023 16:33:54 +0000 (17:33 +0100)]
Limit log file size in development and test

13 months agoStop parameter hashes comparing equal to normal hashes
Tom Hughes [Fri, 27 Oct 2023 16:31:23 +0000 (17:31 +0100)]
Stop parameter hashes comparing equal to normal hashes

13 months agoDrop X-Download-Options from default headers
Tom Hughes [Fri, 27 Oct 2023 16:26:25 +0000 (17:26 +0100)]
Drop X-Download-Options from default headers

13 months agoStop adding autoloaded paths to $LOAD_PATH
Tom Hughes [Fri, 27 Oct 2023 16:25:50 +0000 (17:25 +0100)]
Stop adding autoloaded paths to $LOAD_PATH

13 months agoMerge remote-tracking branch 'upstream/pull/4308'
Tom Hughes [Fri, 27 Oct 2023 13:26:54 +0000 (14:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4308'

13 months agoEnable rails 7.1 changes to model callbacks
Tom Hughes [Thu, 26 Oct 2023 21:51:55 +0000 (22:51 +0100)]
Enable rails 7.1 changes to model callbacks

13 months agoEnable precompilation of filter_parameters
Tom Hughes [Thu, 26 Oct 2023 21:44:02 +0000 (22:44 +0100)]
Enable precompilation of filter_parameters

13 months agoEnable rails 7.1 defaults that relate to rolling upgrades
Tom Hughes [Thu, 26 Oct 2023 21:35:23 +0000 (22:35 +0100)]
Enable rails 7.1 defaults that relate to rolling upgrades

13 months agoEnable rails 7.1 defaults for features we don't use
Tom Hughes [Thu, 26 Oct 2023 21:23:15 +0000 (22:23 +0100)]
Enable rails 7.1 defaults for features we don't use

13 months agoDisable deprecated singular association names
Tom Hughes [Thu, 26 Oct 2023 21:19:02 +0000 (22:19 +0100)]
Disable deprecated singular association names

13 months agoBuild new relation member indexes concurrently
Tom Hughes [Thu, 26 Oct 2023 18:58:11 +0000 (19:58 +0100)]
Build new relation member indexes concurrently

13 months agoDisable transactions for relation member index changes
Tom Hughes [Thu, 26 Oct 2023 18:48:25 +0000 (19:48 +0100)]
Disable transactions for relation member index changes

13 months agoMerge pull request #4300 from tomhughes/relation-members-primary-key
Andy Allan [Thu, 26 Oct 2023 18:40:57 +0000 (19:40 +0100)]
Merge pull request #4300 from tomhughes/relation-members-primary-key

Simplify primary key for relation members tables

13 months agoAssign proper sequence numbers to relation members in tests
Tom Hughes [Tue, 10 Oct 2023 20:35:00 +0000 (21:35 +0100)]
Assign proper sequence numbers to relation members in tests

13 months agoRemove extraneous fields from primary keys for relation members
Tom Hughes [Tue, 10 Oct 2023 19:53:20 +0000 (20:53 +0100)]
Remove extraneous fields from primary keys for relation members