]> git.openstreetmap.org Git - rails.git/log
rails.git
10 months agoMerge remote-tracking branch 'upstream/pull/4440'
Tom Hughes [Sun, 7 Jan 2024 12:20:47 +0000 (12:20 +0000)]
Merge remote-tracking branch 'upstream/pull/4440'

10 months agoAdd revoke all blocks action
Anton Khorev [Thu, 28 Dec 2023 02:57:58 +0000 (05:57 +0300)]
Add revoke all blocks action

10 months agoAdd controls to revoke all blocks page
Anton Khorev [Wed, 27 Dec 2023 16:19:37 +0000 (19:19 +0300)]
Add controls to revoke all blocks page

10 months agoAdd revoke all blocks page title
Anton Khorev [Wed, 27 Dec 2023 15:54:29 +0000 (18:54 +0300)]
Add revoke all blocks page title

10 months agoCreate an empty revoke all blocks page
Anton Khorev [Wed, 27 Dec 2023 15:39:17 +0000 (18:39 +0300)]
Create an empty revoke all blocks page

10 months agoAdd revoke all blocks link
Anton Khorev [Wed, 27 Dec 2023 15:16:57 +0000 (18:16 +0300)]
Add revoke all blocks link

10 months agoMerge remote-tracking branch 'upstream/pull/4436'
Tom Hughes [Sun, 7 Jan 2024 12:12:56 +0000 (12:12 +0000)]
Merge remote-tracking branch 'upstream/pull/4436'

10 months agoAdd website oauth app registration to system tests
Anton Khorev [Mon, 25 Dec 2023 16:07:00 +0000 (19:07 +0300)]
Add website oauth app registration to system tests

10 months agoMerge remote-tracking branch 'upstream/pull/4433'
Tom Hughes [Sun, 7 Jan 2024 10:06:14 +0000 (10:06 +0000)]
Merge remote-tracking branch 'upstream/pull/4433'

10 months agoMerge remote-tracking branch 'upstream/pull/4459'
Tom Hughes [Sun, 7 Jan 2024 09:59:39 +0000 (09:59 +0000)]
Merge remote-tracking branch 'upstream/pull/4459'

10 months agoAdd closed_by attribute to :closed note factory trait
Anton Khorev [Fri, 5 Jan 2024 10:04:06 +0000 (13:04 +0300)]
Add closed_by attribute to :closed note factory trait

10 months agoAdd :closed trait to note factory
Anton Khorev [Fri, 5 Jan 2024 09:34:27 +0000 (12:34 +0300)]
Add :closed trait to note factory

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Jan 2024 12:18:08 +0000 (13:18 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoMerge remote-tracking branch 'upstream/pull/4451'
Tom Hughes [Wed, 3 Jan 2024 18:49:59 +0000 (18:49 +0000)]
Merge remote-tracking branch 'upstream/pull/4451'

10 months agoMerge remote-tracking branch 'upstream/pull/4458'
Tom Hughes [Wed, 3 Jan 2024 18:47:12 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/4458'

10 months agoMerge remote-tracking branch 'upstream/pull/4457'
Tom Hughes [Wed, 3 Jan 2024 18:47:03 +0000 (18:47 +0000)]
Merge remote-tracking branch 'upstream/pull/4457'

10 months agoMerge remote-tracking branch 'upstream/pull/4456'
Tom Hughes [Wed, 3 Jan 2024 18:46:36 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/pull/4456'

10 months agoMerge remote-tracking branch 'upstream/pull/4454'
Tom Hughes [Wed, 3 Jan 2024 18:44:09 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/4454'

10 months agoIncrease min zoom level of bicycle parking in cyclemap key
Anton Khorev [Wed, 3 Jan 2024 15:25:47 +0000 (18:25 +0300)]
Increase min zoom level of bicycle parking in cyclemap key

10 months agoAdjust cycleway widths in cyclemap map key
Anton Khorev [Wed, 3 Jan 2024 15:16:56 +0000 (18:16 +0300)]
Adjust cycleway widths in cyclemap map key

10 months agoAdjust highway widths in cyclemap map key
Anton Khorev [Wed, 3 Jan 2024 14:06:29 +0000 (17:06 +0300)]
Adjust highway widths in cyclemap map key

10 months agoUse assert_not_predicate in tests that have assert_predicate
Anton Khorev [Wed, 3 Jan 2024 13:01:17 +0000 (16:01 +0300)]
Use assert_not_predicate in tests that have assert_predicate

10 months agoMove new diary entry link to the end
Anton Khorev [Wed, 3 Jan 2024 10:18:08 +0000 (13:18 +0300)]
Move new diary entry link to the end

10 months agoAdd links to diaries in preferred languages
Anton Khorev [Tue, 2 Jan 2024 05:09:35 +0000 (08:09 +0300)]
Add links to diaries in preferred languages

10 months agoFix indent
Anton Khorev [Tue, 2 Jan 2024 04:39:56 +0000 (07:39 +0300)]
Fix indent

10 months agoMerge remote-tracking branch 'upstream/pull/4452'
Tom Hughes [Tue, 2 Jan 2024 18:54:18 +0000 (18:54 +0000)]
Merge remote-tracking branch 'upstream/pull/4452'

10 months agoDisable Minitest/MultipleAssertions cop for now
Tom Hughes [Tue, 2 Jan 2024 17:58:32 +0000 (17:58 +0000)]
Disable Minitest/MultipleAssertions cop for now

https://github.com/rubocop/rubocop-minitest/issues/292

10 months agoUpdate bundle
Tom Hughes [Tue, 2 Jan 2024 17:41:12 +0000 (17:41 +0000)]
Update bundle

10 months agoDon't show native language name if it's the same as English name
Anton Khorev [Tue, 2 Jan 2024 06:09:33 +0000 (09:09 +0300)]
Don't show native language name if it's the same as English name

10 months agoMerge remote-tracking branch 'upstream/pull/4449'
Tom Hughes [Mon, 1 Jan 2024 19:12:03 +0000 (19:12 +0000)]
Merge remote-tracking branch 'upstream/pull/4449'

10 months agoMerge remote-tracking branch 'upstream/pull/4450'
Tom Hughes [Mon, 1 Jan 2024 19:10:01 +0000 (19:10 +0000)]
Merge remote-tracking branch 'upstream/pull/4450'

10 months agoMerge remote-tracking branch 'upstream/pull/4448'
Tom Hughes [Mon, 1 Jan 2024 19:08:42 +0000 (19:08 +0000)]
Merge remote-tracking branch 'upstream/pull/4448'

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

10 months agoAdd cities to mapnik map key
Anton Khorev [Sun, 31 Dec 2023 03:47:10 +0000 (06:47 +0300)]
Add cities to mapnik map key

10 months agoAdd login notice for note discussions
Anton Khorev [Sun, 31 Dec 2023 01:43:09 +0000 (04:43 +0300)]
Add login notice for note discussions

10 months agoAdd mtb route cyclemap key
Anton Khorev [Sat, 30 Dec 2023 17:50:34 +0000 (20:50 +0300)]
Add mtb route cyclemap key

10 months agoAdd bridleway cyclemap key
Anton Khorev [Sat, 30 Dec 2023 17:24:31 +0000 (20:24 +0300)]
Add bridleway cyclemap key

10 months agoMerge remote-tracking branch 'upstream/pull/4443'
Tom Hughes [Fri, 29 Dec 2023 19:12:45 +0000 (19:12 +0000)]
Merge remote-tracking branch 'upstream/pull/4443'

10 months agoMerge remote-tracking branch 'upstream/pull/4442'
Tom Hughes [Fri, 29 Dec 2023 19:11:38 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/4442'

10 months agoAdd code blocks markdown guidance
Altilunium [Fri, 29 Dec 2023 19:08:57 +0000 (19:08 +0000)]
Add code blocks markdown guidance

Closes #4441

10 months agotest/system/messages_test.rb: Rename NoteCommentsTest -> MessagesTest
Gregory Igelmund [Fri, 29 Dec 2023 14:42:18 +0000 (09:42 -0500)]
test/system/messages_test.rb: Rename NoteCommentsTest -> MessagesTest

10 months agoUpdate main roads mapnik map key
Anton Khorev [Fri, 29 Dec 2023 03:58:22 +0000 (06:58 +0300)]
Update main roads mapnik map key

10 months agoMerge remote-tracking branch 'upstream/pull/4439'
Tom Hughes [Thu, 28 Dec 2023 18:39:22 +0000 (18:39 +0000)]
Merge remote-tracking branch 'upstream/pull/4439'

10 months agoMerge remote-tracking branch 'upstream/pull/4438'
Tom Hughes [Thu, 28 Dec 2023 18:37:42 +0000 (18:37 +0000)]
Merge remote-tracking branch 'upstream/pull/4438'

10 months agoMerge remote-tracking branch 'upstream/pull/4437'
Tom Hughes [Thu, 28 Dec 2023 18:35:18 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/4437'

10 months agoMerge remote-tracking branch 'upstream/pull/4434'
Tom Hughes [Thu, 28 Dec 2023 18:23:21 +0000 (18:23 +0000)]
Merge remote-tracking branch 'upstream/pull/4434'

10 months agoMerge remote-tracking branch 'upstream/pull/4432'
Tom Hughes [Thu, 28 Dec 2023 18:21:46 +0000 (18:21 +0000)]
Merge remote-tracking branch 'upstream/pull/4432'

10 months agoMerge remote-tracking branch 'upstream/pull/4431'
Tom Hughes [Thu, 28 Dec 2023 18:18:23 +0000 (18:18 +0000)]
Merge remote-tracking branch 'upstream/pull/4431'

10 months agoMerge remote-tracking branch 'upstream/pull/4430'
Tom Hughes [Thu, 28 Dec 2023 18:12:09 +0000 (18:12 +0000)]
Merge remote-tracking branch 'upstream/pull/4430'

10 months agoUpdate bundle
Tom Hughes [Thu, 28 Dec 2023 17:47:09 +0000 (17:47 +0000)]
Update bundle

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

10 months agoSet block ends_at to exactly created_at + duration
Anton Khorev [Wed, 27 Dec 2023 03:48:00 +0000 (06:48 +0300)]
Set block ends_at to exactly created_at + duration

10 months agoAdd missing locale string for /oauth2/authorized_applications
Anton Khorev [Mon, 25 Dec 2023 02:00:51 +0000 (05:00 +0300)]
Add missing locale string for /oauth2/authorized_applications

10 months agoSet sizes of welcome buttons to be as equal as possible
Anton Khorev [Tue, 26 Dec 2023 03:26:46 +0000 (06:26 +0300)]
Set sizes of welcome buttons to be as equal as possible

10 months agoFix messages heading update when message is deleted
Anton Khorev [Tue, 26 Dec 2023 01:46:35 +0000 (04:46 +0300)]
Fix messages heading update when message is deleted

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Dec 2023 12:21:34 +0000 (13:21 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoUse border/casing/line in map keys
Anton Khorev [Sat, 23 Dec 2023 17:44:50 +0000 (20:44 +0300)]
Use border/casing/line in map keys

10 months agoUse <path> instead of <line>
Anton Khorev [Sun, 24 Dec 2023 16:46:43 +0000 (19:46 +0300)]
Use <path> instead of <line>

10 months agoAdd border/casing/line attribute support to svg map keys
Anton Khorev [Sat, 23 Dec 2023 17:38:32 +0000 (20:38 +0300)]
Add border/casing/line attribute support to svg map keys

10 months agoClean up sprites
Anton Khorev [Sun, 24 Dec 2023 15:33:33 +0000 (18:33 +0300)]
Clean up sprites

10 months agoDelete unused road map key images
Anton Khorev [Sun, 24 Dec 2023 14:50:48 +0000 (17:50 +0300)]
Delete unused road map key images

11 months agoBump osm-community-index from 5.6.0 to 5.6.1
dependabot[bot] [Fri, 22 Dec 2023 23:08:54 +0000 (23:08 +0000)]
Bump osm-community-index from 5.6.0 to 5.6.1

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.6.0 to 5.6.1.
- [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.6.0...v5.6.1)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
11 months agoMerge remote-tracking branch 'upstream/pull/4387'
Tom Hughes [Thu, 21 Dec 2023 18:48:43 +0000 (18:48 +0000)]
Merge remote-tracking branch 'upstream/pull/4387'

11 months agoMerge remote-tracking branch 'upstream/pull/4425'
Tom Hughes [Thu, 21 Dec 2023 18:46:22 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/pull/4425'

11 months agoIncrease RuboCop complexity limits
Anton Khorev [Thu, 21 Dec 2023 14:29:51 +0000 (17:29 +0300)]
Increase RuboCop complexity limits

11 months agoAdd oauth scope for redactions
Anton Khorev [Sun, 3 Dec 2023 03:00:54 +0000 (06:00 +0300)]
Add oauth scope for redactions

11 months agoHighlight moderator-only scopes when showing authorizations
Anton Khorev [Sat, 21 Oct 2023 17:39:55 +0000 (20:39 +0300)]
Highlight moderator-only scopes when showing authorizations

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

11 months agoMerge remote-tracking branch 'upstream/pull/4428'
Tom Hughes [Thu, 21 Dec 2023 11:01:48 +0000 (11:01 +0000)]
Merge remote-tracking branch 'upstream/pull/4428'

11 months agoMerge remote-tracking branch 'upstream/pull/4426'
Tom Hughes [Wed, 20 Dec 2023 18:39:57 +0000 (18:39 +0000)]
Merge remote-tracking branch 'upstream/pull/4426'

11 months agoMerge pull request #4284 from grekko/add_user_mute
Andy Allan [Wed, 20 Dec 2023 18:06:48 +0000 (18:06 +0000)]
Merge pull request #4284 from grekko/add_user_mute

Add UserMute to control message visibility

11 months agoUpdate minimum postgresql version
Andy Allan [Wed, 20 Dec 2023 15:30:16 +0000 (15:30 +0000)]
Update minimum postgresql version

We started requiring postgresql 12 after the migrations in #4319

11 months agoReduce changeset comment rate limits further in tests
Andy Allan [Wed, 20 Dec 2023 11:38:54 +0000 (11:38 +0000)]
Reduce changeset comment rate limits further in tests

This has an impact on how long the tests take to run.

11 months agoAvoid running integration tests in every locale
Andy Allan [Wed, 20 Dec 2023 11:03:22 +0000 (11:03 +0000)]
Avoid running integration tests in every locale

We have over 200 locales, and so this takes a long time. This reduces
time taken from around 200 seconds to 6 to run these tests.

11 months agoAllow arrays of names in map key entries
Anton Khorev [Wed, 20 Dec 2023 00:57:03 +0000 (03:57 +0300)]
Allow arrays of names in map key entries

11 months agoMerge remote-tracking branch 'upstream/pull/4424'
Tom Hughes [Tue, 19 Dec 2023 18:59:05 +0000 (18:59 +0000)]
Merge remote-tracking branch 'upstream/pull/4424'

11 months agoMerge remote-tracking branch 'upstream/pull/4423'
Tom Hughes [Tue, 19 Dec 2023 18:59:03 +0000 (18:59 +0000)]
Merge remote-tracking branch 'upstream/pull/4423'

11 months agoMerge remote-tracking branch 'upstream/pull/4422'
Tom Hughes [Tue, 19 Dec 2023 18:58:59 +0000 (18:58 +0000)]
Merge remote-tracking branch 'upstream/pull/4422'

11 months agoMerge remote-tracking branch 'upstream/pull/4421'
Tom Hughes [Tue, 19 Dec 2023 18:56:54 +0000 (18:56 +0000)]
Merge remote-tracking branch 'upstream/pull/4421'

11 months agoAdd tests & factories for UserMute feature
Gregory Igelmund [Wed, 13 Dec 2023 18:09:39 +0000 (13:09 -0500)]
Add tests & factories for UserMute feature

11 months agoAdd basic structures for UserMute and Message muting logic
Gregory Igelmund [Wed, 13 Dec 2023 18:06:28 +0000 (13:06 -0500)]
Add basic structures for UserMute and Message muting logic

Including models, migration, controllers, views & locales.

11 months agoSet config.active_model.i18n_customize_full_message = true
Gregory Igelmund [Wed, 13 Dec 2023 18:04:21 +0000 (13:04 -0500)]
Set config.active_model.i18n_customize_full_message = true

Enables better error message customization

11 months ago.rubocop_todo.yml: Increase Metrics/ClassLength from 279 -> 299
Gregory Igelmund [Wed, 13 Dec 2023 18:02:49 +0000 (13:02 -0500)]
.rubocop_todo.yml: Increase Metrics/ClassLength from 279 -> 299

11 months agoRefactor app/views/messages templates
Gregory Igelmund [Wed, 13 Dec 2023 18:01:40 +0000 (13:01 -0500)]
Refactor app/views/messages templates

11 months agoUpdate zoom levels of highways/cycleways in cyclemap map key
Anton Khorev [Tue, 19 Dec 2023 15:21:12 +0000 (18:21 +0300)]
Update zoom levels of highways/cycleways in cyclemap map key

11 months agoUpdate cyclemap map key landcover colors
Anton Khorev [Tue, 19 Dec 2023 15:07:20 +0000 (18:07 +0300)]
Update cyclemap map key landcover colors

11 months agoUpdate runway and taxiway mapnik map key
Anton Khorev [Tue, 19 Dec 2023 14:38:23 +0000 (17:38 +0300)]
Update runway and taxiway mapnik map key

11 months agoUse inline svg for solid map key images
Anton Khorev [Tue, 19 Dec 2023 12:41:10 +0000 (15:41 +0300)]
Use inline svg for solid map key images

11 months agoAdd solid svg image helper
Anton Khorev [Sat, 16 Dec 2023 12:50:13 +0000 (15:50 +0300)]
Add solid svg image helper

11 months agoRemove map key image custom css
Anton Khorev [Sat, 29 Jul 2023 18:37:31 +0000 (21:37 +0300)]
Remove map key image custom css

11 months agoDisable Minitest/MultipleAssertions cop for now
Tom Hughes [Tue, 19 Dec 2023 12:37:02 +0000 (12:37 +0000)]
Disable Minitest/MultipleAssertions cop for now

https://github.com/rubocop/rubocop-minitest/issues/283

11 months agoFix erblint warning
Tom Hughes [Tue, 19 Dec 2023 12:12:21 +0000 (12:12 +0000)]
Fix erblint warning

11 months agoUpdate bundle
Tom Hughes [Tue, 19 Dec 2023 12:04:55 +0000 (12:04 +0000)]
Update bundle

11 months agoMerge remote-tracking branch 'upstream/pull/4418'
Tom Hughes [Tue, 19 Dec 2023 12:04:30 +0000 (12:04 +0000)]
Merge remote-tracking branch 'upstream/pull/4418'

11 months agoAdd test for no_trace_download ACLs
Tom Hughes [Tue, 19 Dec 2023 11:59:33 +0000 (11:59 +0000)]
Add test for no_trace_download ACLs

11 months agoAdd test for no_note_comment ACLs
Tom Hughes [Tue, 19 Dec 2023 11:59:12 +0000 (11:59 +0000)]
Add test for no_note_comment ACLs

11 months agoMake allow_account_creation work the same as other ACLs
Tom Hughes [Tue, 19 Dec 2023 11:58:30 +0000 (11:58 +0000)]
Make allow_account_creation work the same as other ACLs

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

11 months agoReplace rectangular map key images with width/height/fill
Anton Khorev [Mon, 18 Dec 2023 11:11:08 +0000 (14:11 +0300)]
Replace rectangular map key images with width/height/fill

11 months agoMerge remote-tracking branch 'upstream/pull/4407'
Tom Hughes [Sun, 17 Dec 2023 18:41:56 +0000 (18:41 +0000)]
Merge remote-tracking branch 'upstream/pull/4407'