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

12 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

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

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

12 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

12 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

12 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

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

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

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

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

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

12 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>
12 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

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

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

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

12 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

12 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

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

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

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

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

12 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

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

12 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

12 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

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

12 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

12 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

12 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

12 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

12 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

12 months agoMerge remote-tracking branch 'upstream/pull/4317'
Tom Hughes [Thu, 26 Oct 2023 12:14:43 +0000 (13:14 +0100)]
Merge remote-tracking branch 'upstream/pull/4317'

12 months agoMerge pull request #4170 from osmcz/cuzk
Andy Allan [Thu, 26 Oct 2023 12:06:56 +0000 (13:06 +0100)]
Merge pull request #4170 from osmcz/cuzk

Add contributor info for Czechia for copyright web page

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Oct 2023 11:20:38 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.

12 months agoSwitch back to bootstrap releases
Andy Allan [Thu, 26 Oct 2023 10:38:10 +0000 (11:38 +0100)]
Switch back to bootstrap releases

Bootstrap-rubygem 5.3.2 onwards allows us to use dartsass-sprockets.

Refs #4262

13 months agoMerge remote-tracking branch 'upstream/pull/4293'
Tom Hughes [Wed, 25 Oct 2023 17:19:57 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4293'

13 months agoMerge remote-tracking branch 'upstream/pull/4315'
Tom Hughes [Wed, 25 Oct 2023 17:15:26 +0000 (18:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4315'

13 months agoOverride left/right tooltip arrow placement in rtl mode
Anton Khorev [Tue, 17 Oct 2023 12:08:22 +0000 (15:08 +0300)]
Override left/right tooltip arrow placement in rtl mode

13 months agoDon't pass placement: right to tooltip()
Anton Khorev [Tue, 17 Oct 2023 12:19:37 +0000 (15:19 +0300)]
Don't pass placement: right to tooltip()

Bootstrap flips it on its own, see https://getbootstrap.com/docs/5.2/components/tooltips/#directions

13 months agoApply unread message background to table cells
Anton Khorev [Wed, 25 Oct 2023 12:02:28 +0000 (15:02 +0300)]
Apply unread message background to table cells

Required after updating Bootstrap.

13 months agoMerge remote-tracking branch 'upstream/pull/4262'
Tom Hughes [Tue, 24 Oct 2023 16:37:48 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4262'

13 months agoUpgrade to bootstrap 5.3
Andy Allan [Wed, 20 Sep 2023 15:15:04 +0000 (16:15 +0100)]
Upgrade to bootstrap 5.3

13 months agoMerge remote-tracking branch 'upstream/pull/4309'
Tom Hughes [Tue, 24 Oct 2023 16:26:39 +0000 (17:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4309'

13 months agoUpdate bundle
Tom Hughes [Tue, 24 Oct 2023 16:09:39 +0000 (17:09 +0100)]
Update bundle

13 months agoFix file dimensions and switch from png to jpg
Adam Hoyle [Tue, 24 Oct 2023 11:11:51 +0000 (12:11 +0100)]
Fix file dimensions and switch from png to jpg

13 months agoAdd Africa banner (with @2x)
Adam Hoyle [Tue, 24 Oct 2023 07:44:23 +0000 (08:44 +0100)]
Add Africa banner (with @2x)

13 months agorerun script/misc/update-wiki-pages
Mateusz Konieczny [Mon, 23 Oct 2023 19:50:22 +0000 (21:50 +0200)]
rerun script/misc/update-wiki-pages

13 months agoAdd banner for SOTM Asia 2023
Adam Hoyle [Mon, 23 Oct 2023 13:14:59 +0000 (14:14 +0100)]
Add banner for SOTM Asia 2023

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Oct 2023 11:21:59 +0000 (13:21 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoMerge remote-tracking branch 'upstream/pull/4305'
Tom Hughes [Sat, 21 Oct 2023 10:05:04 +0000 (11:05 +0100)]
Merge remote-tracking branch 'upstream/pull/4305'

13 months agoMerge remote-tracking branch 'upstream/pull/4306'
Tom Hughes [Sat, 21 Oct 2023 10:04:10 +0000 (11:04 +0100)]
Merge remote-tracking branch 'upstream/pull/4306'

13 months agoBump eslint from 8.51.0 to 8.52.0
dependabot[bot] [Fri, 20 Oct 2023 23:43:06 +0000 (23:43 +0000)]
Bump eslint from 8.51.0 to 8.52.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.51.0 to 8.52.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.51.0...v8.52.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 agoRemove user list custom css
Anton Khorev [Fri, 20 Oct 2023 17:42:38 +0000 (20:42 +0300)]
Remove user list custom css

13 months agoMerge remote-tracking branch 'upstream/pull/4304'
Tom Hughes [Fri, 20 Oct 2023 16:11:13 +0000 (17:11 +0100)]
Merge remote-tracking branch 'upstream/pull/4304'

13 months agoMerge remote-tracking branch 'upstream/pull/4303'
Tom Hughes [Fri, 20 Oct 2023 16:07:07 +0000 (17:07 +0100)]
Merge remote-tracking branch 'upstream/pull/4303'

13 months agoMerge remote-tracking branch 'upstream/pull/4302'
Tom Hughes [Fri, 20 Oct 2023 16:01:03 +0000 (17:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4302'

13 months agoRemove oauth list custom css
Anton Khorev [Fri, 20 Oct 2023 14:54:51 +0000 (17:54 +0300)]
Remove oauth list custom css

13 months agoRemove some print-related custom css
Anton Khorev [Fri, 20 Oct 2023 14:26:51 +0000 (17:26 +0300)]
Remove some print-related custom css

13 months agoRemove some search/directions custom css
Anton Khorev [Fri, 20 Oct 2023 13:38:25 +0000 (16:38 +0300)]
Remove some search/directions custom css

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Oct 2023 11:20:13 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoadd contributor info for Czechia
tom.k [Tue, 15 Aug 2023 16:23:27 +0000 (18:23 +0200)]
add contributor info for Czechia

13 months agoMerge pull request #4278 from tomhughes/rails71
Andy Allan [Wed, 18 Oct 2023 17:51:16 +0000 (18:51 +0100)]
Merge pull request #4278 from tomhughes/rails71

Upgrade to rails 7.1.1

13 months agoUpdate database structure for change in migration ordering
Tom Hughes [Sat, 7 Oct 2023 11:39:01 +0000 (12:39 +0100)]
Update database structure for change in migration ordering

13 months agoUpdate test results for changes to rescuable exception handling
Tom Hughes [Sat, 7 Oct 2023 10:44:38 +0000 (11:44 +0100)]
Update test results for changes to rescuable exception handling

https://github.com/rails/rails/pull/45867

13 months agoFix test as rails no longer seems to return a body for redirects
Tom Hughes [Fri, 6 Oct 2023 21:19:22 +0000 (22:19 +0100)]
Fix test as rails no longer seems to return a body for redirects

13 months agoAdjust code for rails internal changes
Tom Hughes [Fri, 6 Oct 2023 21:18:30 +0000 (22:18 +0100)]
Adjust code for rails internal changes

13 months agoReplace composite_primary_keys with rails builtin support
Tom Hughes [Fri, 6 Oct 2023 21:13:50 +0000 (22:13 +0100)]
Replace composite_primary_keys with rails builtin support

13 months agoUse db:schema:load to populate the database when linting annotations
Tom Hughes [Wed, 18 Oct 2023 16:36:53 +0000 (17:36 +0100)]
Use db:schema:load to populate the database when linting annotations

13 months agoUpdate to rails 7.1.1
Tom Hughes [Fri, 6 Oct 2023 21:12:21 +0000 (22:12 +0100)]
Update to rails 7.1.1

13 months agoMerge pull request #4299 from AntonKhorev/no-changeset-action-button-css
Andy Allan [Wed, 18 Oct 2023 15:25:27 +0000 (16:25 +0100)]
Merge pull request #4299 from AntonKhorev/no-changeset-action-button-css

Remove subscribe/unsubscribe button custom css

13 months agoUpdate annotation for change to changeset_tags indexes
Tom Hughes [Wed, 18 Oct 2023 14:53:08 +0000 (15:53 +0100)]
Update annotation for change to changeset_tags indexes

13 months agoMerge pull request #4279 from tomhughes/changeset-tags-primary-key
Andy Allan [Wed, 18 Oct 2023 14:41:01 +0000 (15:41 +0100)]
Merge pull request #4279 from tomhughes/changeset-tags-primary-key

Add a primary key to the changeset_tags table

13 months agoRemove subscribe/unsubscribe button custom css
Anton Khorev [Wed, 18 Oct 2023 14:37:36 +0000 (17:37 +0300)]
Remove subscribe/unsubscribe button custom css

13 months agoMerge pull request #4289 from grekko/github_workflow_add_annotate_models_check_2
Andy Allan [Wed, 18 Oct 2023 13:22:05 +0000 (14:22 +0100)]
Merge pull request #4289 from grekko/github_workflow_add_annotate_models_check_2

.github/workflows/lint.yml: Check if annotate_models is up to date

13 months agoMerge remote-tracking branch 'upstream/pull/4295'
Tom Hughes [Tue, 17 Oct 2023 17:49:58 +0000 (18:49 +0100)]
Merge remote-tracking branch 'upstream/pull/4295'

13 months agoMerge remote-tracking branch 'upstream/pull/4294'
Tom Hughes [Tue, 17 Oct 2023 17:47:24 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4294'

13 months agoMerge remote-tracking branch 'upstream/pull/4292'
Tom Hughes [Tue, 17 Oct 2023 17:36:02 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4292'

13 months agoUpdate i18n tasks from latest gem
Tom Hughes [Tue, 17 Oct 2023 17:25:38 +0000 (18:25 +0100)]
Update i18n tasks from latest gem

13 months agoUpdate bundle
Tom Hughes [Tue, 17 Oct 2023 17:25:32 +0000 (18:25 +0100)]
Update bundle

13 months agoReplace secondary nav buttons custom css with classes
Anton Khorev [Tue, 17 Oct 2023 14:35:14 +0000 (17:35 +0300)]
Replace secondary nav buttons custom css with classes

13 months agoEnable focus outline on More button
Anton Khorev [Tue, 17 Oct 2023 14:21:25 +0000 (17:21 +0300)]
Enable focus outline on More button

13 months agoDecrease directions button height to match Go button
Anton Khorev [Tue, 17 Oct 2023 09:26:29 +0000 (12:26 +0300)]
Decrease directions button height to match Go button

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Oct 2023 11:21:41 +0000 (13:21 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoRemove some h1/logo custom css
Anton Khorev [Mon, 16 Oct 2023 09:23:49 +0000 (12:23 +0300)]
Remove some h1/logo custom css

13 months ago.github/workflows/lint.yml: Add task verifying annotations are up2date
Gregory Igelmund [Sat, 14 Oct 2023 03:22:40 +0000 (11:22 +0800)]
.github/workflows/lint.yml: Add task verifying annotations are up2date

13 months agoAnnotate models
Gregory Igelmund [Sat, 14 Oct 2023 03:19:13 +0000 (11:19 +0800)]
Annotate models

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Oct 2023 11:20:49 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoUpdate bundle
Tom Hughes [Tue, 10 Oct 2023 17:35:20 +0000 (18:35 +0100)]
Update bundle

13 months agoMerge remote-tracking branch 'upstream/pull/4276'
Tom Hughes [Tue, 10 Oct 2023 17:19:13 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4276'

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Oct 2023 11:22:50 +0000 (13:22 +0200)]
Localisation updates from https://translatewiki.net.

13 months agoAdd a primary key to the changeset_tags table
Tom Hughes [Sat, 7 Oct 2023 16:51:28 +0000 (17:51 +0100)]
Add a primary key to the changeset_tags table

13 months agoImprove support for primary keys in migrations
Tom Hughes [Sat, 7 Oct 2023 16:50:10 +0000 (17:50 +0100)]
Improve support for primary keys in migrations

13 months agoDrop redundant primary key specification for languages table
Tom Hughes [Sat, 7 Oct 2023 14:08:30 +0000 (15:08 +0100)]
Drop redundant primary key specification for languages table

13 months agoDrop workaround to force UTF8 form upload in IE8
Tom Hughes [Sat, 7 Oct 2023 10:57:54 +0000 (11:57 +0100)]
Drop workaround to force UTF8 form upload in IE8

This has been disabled by default in rails for some time.

13 months agoBump eslint from 8.50.0 to 8.51.0
dependabot[bot] [Fri, 6 Oct 2023 23:42:27 +0000 (23:42 +0000)]
Bump eslint from 8.50.0 to 8.51.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.51.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.50.0...v8.51.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 agoFix rails 7.1.0 deprecation warning
Tom Hughes [Fri, 6 Oct 2023 18:07:19 +0000 (19:07 +0100)]
Fix rails 7.1.0 deprecation warning

13 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Oct 2023 11:20:32 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.