]> git.openstreetmap.org Git - rails.git/log
rails.git
16 months agoInclude both copies of the password in the saved user
Tom Hughes [Fri, 12 Jan 2024 17:41:13 +0000 (17:41 +0000)]
Include both copies of the password in the saved user

This allows is to go back to hashing passwords when the user is saved.

Fixes #4474

16 months agoTest that signups can be confirmed and can authenticate afterwards
Tom Hughes [Fri, 12 Jan 2024 17:35:41 +0000 (17:35 +0000)]
Test that signups can be confirmed and can authenticate afterwards

16 months agoRemove temporary "_only" suffixes from map key entries
Anton Khorev [Fri, 12 Jan 2024 13:05:51 +0000 (16:05 +0300)]
Remove temporary "_only" suffixes from map key entries

16 months agoUse test() instead of define_method() to add locale-specific tests
Anton Khorev [Fri, 12 Jan 2024 12:05:45 +0000 (15:05 +0300)]
Use test() instead of define_method() to add locale-specific tests

16 months agoEmphasize trace tags in import emails
Anton Khorev [Thu, 11 Jan 2024 15:07:18 +0000 (18:07 +0300)]
Emphasize trace tags in import emails

16 months agoLink to all user's traces from successful import emails
Anton Khorev [Thu, 11 Jan 2024 14:48:40 +0000 (17:48 +0300)]
Link to all user's traces from successful import emails

16 months agoDon't link to trace pages from failed import emails
Anton Khorev [Thu, 11 Jan 2024 14:11:09 +0000 (17:11 +0300)]
Don't link to trace pages from failed import emails

16 months agoLink to trace pages from successful import emails
Anton Khorev [Thu, 11 Jan 2024 13:49:01 +0000 (16:49 +0300)]
Link to trace pages from successful import emails

16 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Jan 2024 12:23:29 +0000 (13:23 +0100)]
Localisation updates from https://translatewiki.net.

16 months agoUpdate package exclusion list when using rbenv
Andy Allan [Wed, 10 Jan 2024 17:53:21 +0000 (17:53 +0000)]
Update package exclusion list when using rbenv

The package lists elsewhere were simplified in d6d16dedb917d1e0339eced418de8ae908dba3e8

16 months agoMerge pull request #4469 from AntonKhorev/no-openlayers-cfg
Andy Allan [Wed, 10 Jan 2024 15:41:56 +0000 (15:41 +0000)]
Merge pull request #4469 from AntonKhorev/no-openlayers-cfg

Remove OpenLayers build config file

16 months agoRemove OpenLayers build config file
Anton Khorev [Wed, 10 Jan 2024 15:25:57 +0000 (18:25 +0300)]
Remove OpenLayers build config file

16 months agoMerge remote-tracking branch 'upstream/pull/4466'
Tom Hughes [Tue, 9 Jan 2024 18:56:25 +0000 (18:56 +0000)]
Merge remote-tracking branch 'upstream/pull/4466'

16 months agoFix new rubocop warnings
Tom Hughes [Tue, 9 Jan 2024 18:23:28 +0000 (18:23 +0000)]
Fix new rubocop warnings

16 months agoUpdate bundle
Tom Hughes [Tue, 9 Jan 2024 18:13:22 +0000 (18:13 +0000)]
Update bundle

16 months agoAdd link to updating user into issue heading
Anton Khorev [Tue, 9 Jan 2024 13:39:46 +0000 (16:39 +0300)]
Add link to updating user into issue heading

16 months agoShow dates as <time> elements on issues pages
Anton Khorev [Tue, 9 Jan 2024 13:02:19 +0000 (16:02 +0300)]
Show dates as <time> elements on issues pages

16 months agoRemove string interpolation from issue heading
Anton Khorev [Tue, 9 Jan 2024 13:25:48 +0000 (16:25 +0300)]
Remove string interpolation from issue heading

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

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

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

16 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

16 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

16 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

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

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

16 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

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

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

16 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

16 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

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

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

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

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

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

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

16 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

16 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

16 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

16 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

16 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

16 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

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

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

16 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

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

16 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

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

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

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

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

16 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

16 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

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

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

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

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

16 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

16 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

16 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

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

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

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

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

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

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

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

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

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

17 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

17 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

17 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

17 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

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

17 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

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

17 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

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

17 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

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

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

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

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

17 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

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

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

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

17 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

17 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

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

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

17 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

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

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

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

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

17 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

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