]> git.openstreetmap.org Git - rails.git/log
rails.git
17 months agoCreate trace data resource
Anton Khorev [Thu, 23 Jan 2025 03:00:23 +0000 (06:00 +0300)]
Create trace data resource

17 months agoMerge remote-tracking branch 'upstream/pull/5533'
Tom Hughes [Wed, 22 Jan 2025 18:11:48 +0000 (18:11 +0000)]
Merge remote-tracking branch 'upstream/pull/5533'

17 months agoMerge remote-tracking branch 'upstream/pull/5535'
Tom Hughes [Wed, 22 Jan 2025 18:07:34 +0000 (18:07 +0000)]
Merge remote-tracking branch 'upstream/pull/5535'

17 months agoMerge remote-tracking branch 'upstream/pull/5529'
Tom Hughes [Wed, 22 Jan 2025 17:59:34 +0000 (17:59 +0000)]
Merge remote-tracking branch 'upstream/pull/5529'

17 months agoMerge remote-tracking branch 'upstream/pull/5532'
Tom Hughes [Wed, 22 Jan 2025 17:54:41 +0000 (17:54 +0000)]
Merge remote-tracking branch 'upstream/pull/5532'

17 months agoMerge remote-tracking branch 'upstream/pull/5534'
Tom Hughes [Wed, 22 Jan 2025 17:50:31 +0000 (17:50 +0000)]
Merge remote-tracking branch 'upstream/pull/5534'

17 months agoCreate changeset subscription resource
Anton Khorev [Wed, 22 Jan 2025 16:43:57 +0000 (19:43 +0300)]
Create changeset subscription resource

17 months agoUse flash.now for messages to be shown during this request
Andy Allan [Wed, 22 Jan 2025 13:55:30 +0000 (13:55 +0000)]
Use flash.now for messages to be shown during this request

17 months agoUse a custom cop to check controller action names
Andy Allan [Wed, 16 Oct 2024 18:49:22 +0000 (19:49 +0100)]
Use a custom cop to check controller action names

SpecificActionNames cop taken from https://github.com/rubocop/rubocop-rails/pull/827

17 months agoSet needs_view by default for new blocks
Anton Khorev [Tue, 21 Jan 2025 23:26:07 +0000 (02:26 +0300)]
Set needs_view by default for new blocks

17 months agoMerge branch 'pull/5531'
Anton Khorev [Tue, 21 Jan 2025 22:05:39 +0000 (01:05 +0300)]
Merge branch 'pull/5531'

17 months agoMerge branch 'pull/5530'
Anton Khorev [Tue, 21 Jan 2025 21:44:43 +0000 (00:44 +0300)]
Merge branch 'pull/5530'

17 months agoAdd indexes on user+id to changeset and diary comments
Tom Hughes [Tue, 21 Jan 2025 19:21:17 +0000 (19:21 +0000)]
Add indexes on user+id to changeset and diary comments

17 months agoPreload parent objects for user comments
Tom Hughes [Tue, 21 Jan 2025 19:03:03 +0000 (19:03 +0000)]
Preload parent objects for user comments

17 months agoMerge remote-tracking branch 'upstream/pull/5518'
Tom Hughes [Tue, 21 Jan 2025 18:44:31 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/5518'

17 months agoMerge remote-tracking branch 'upstream/pull/5528'
Tom Hughes [Tue, 21 Jan 2025 18:26:47 +0000 (18:26 +0000)]
Merge remote-tracking branch 'upstream/pull/5528'

17 months agoUpdate bundle
Tom Hughes [Tue, 21 Jan 2025 18:08:49 +0000 (18:08 +0000)]
Update bundle

17 months agoConsistent usage of layer information in _osm_location cookie
mmd-osm [Tue, 21 Jan 2025 17:08:50 +0000 (18:08 +0100)]
Consistent usage of layer information in _osm_location cookie

Fixes #3971

17 months agoTest fallback locale on embed page
Anton Khorev [Mon, 20 Jan 2025 23:49:07 +0000 (02:49 +0300)]
Test fallback locale on embed page

17 months agoMerge branch 'pull/5527'
Anton Khorev [Mon, 20 Jan 2025 23:39:25 +0000 (02:39 +0300)]
Merge branch 'pull/5527'

17 months agoMerge pull request #5421 from tomhughes/ecma-version
Andy Allan [Mon, 20 Jan 2025 17:54:02 +0000 (17:54 +0000)]
Merge pull request #5421 from tomhughes/ecma-version

Bump allowed ECMAScript version to 2021 (ES12)

17 months agoEnable I18n fallback for the embed page
Tom Hughes [Mon, 20 Jan 2025 11:42:23 +0000 (11:42 +0000)]
Enable I18n fallback for the embed page

Fixes #5526.

17 months agoMerge remote-tracking branch 'upstream/pull/5520'
Tom Hughes [Sun, 19 Jan 2025 15:02:11 +0000 (15:02 +0000)]
Merge remote-tracking branch 'upstream/pull/5520'

17 months agoMerge remote-tracking branch 'upstream/pull/5517'
Tom Hughes [Sun, 19 Jan 2025 15:01:25 +0000 (15:01 +0000)]
Merge remote-tracking branch 'upstream/pull/5517'

17 months agoMerge remote-tracking branch 'upstream/pull/5516'
Tom Hughes [Sun, 19 Jan 2025 14:58:26 +0000 (14:58 +0000)]
Merge remote-tracking branch 'upstream/pull/5516'

17 months agoMerge remote-tracking branch 'upstream/pull/5515'
Tom Hughes [Sun, 19 Jan 2025 14:57:40 +0000 (14:57 +0000)]
Merge remote-tracking branch 'upstream/pull/5515'

17 months agoInclude message_read attribute in api output of messages to self
Anton Khorev [Sun, 19 Jan 2025 02:48:36 +0000 (05:48 +0300)]
Include message_read attribute in api output of messages to self

17 months agoCreate changeset_comments resources for users
Anton Khorev [Sun, 19 Jan 2025 01:11:06 +0000 (04:11 +0300)]
Create changeset_comments resources for users

17 months agoCreate user comments controller base class
Anton Khorev [Sun, 19 Jan 2025 00:30:18 +0000 (03:30 +0300)]
Create user comments controller base class

17 months agoAdd tabbed navigation to user's diary comments page
Anton Khorev [Sat, 18 Jan 2025 23:58:56 +0000 (02:58 +0300)]
Add tabbed navigation to user's diary comments page

17 months agoCreate diary_comments resources for users
Anton Khorev [Sat, 18 Jan 2025 23:40:13 +0000 (02:40 +0300)]
Create diary_comments resources for users

17 months agoChange user's diary comments path to match model name
Anton Khorev [Sat, 18 Jan 2025 23:05:49 +0000 (02:05 +0300)]
Change user's diary comments path to match model name

17 months agoRename diary_comments_path to user_diary_comments_path
Anton Khorev [Sat, 18 Jan 2025 22:54:07 +0000 (01:54 +0300)]
Rename diary_comments_path to user_diary_comments_path

17 months agoSimplify diary_comments_path calls in tests
Anton Khorev [Sat, 18 Jan 2025 22:48:34 +0000 (01:48 +0300)]
Simplify diary_comments_path calls in tests

17 months agoCreate traces feed resource
Anton Khorev [Sat, 18 Jan 2025 20:01:47 +0000 (23:01 +0300)]
Create traces feed resource

17 months agoAdd regexp constraints to trace ids
Anton Khorev [Sat, 18 Jan 2025 19:37:37 +0000 (22:37 +0300)]
Add regexp constraints to trace ids

17 months agoUse resourceful routes for api tracepoints
Anton Khorev [Sat, 18 Jan 2025 17:08:07 +0000 (20:08 +0300)]
Use resourceful routes for api tracepoints

17 months agoReplace lookup_friend with lookup_user in FollowsController
Anton Khorev [Sat, 18 Jan 2025 16:35:30 +0000 (19:35 +0300)]
Replace lookup_friend with lookup_user in FollowsController

17 months agoRemove pd checkbox from terms page
Anton Khorev [Sat, 18 Jan 2025 04:23:55 +0000 (07:23 +0300)]
Remove pd checkbox from terms page

17 months agoRemove pd checkbox from signup page
Anton Khorev [Sat, 18 Jan 2025 04:11:41 +0000 (07:11 +0300)]
Remove pd checkbox from signup page

17 months agoAdd link from settings to pd declaration
Anton Khorev [Sat, 18 Jan 2025 03:53:33 +0000 (06:53 +0300)]
Add link from settings to pd declaration

17 months agoUse multiple lines in settings contributor terms section
Anton Khorev [Sat, 18 Jan 2025 03:44:22 +0000 (06:44 +0300)]
Use multiple lines in settings contributor terms section

17 months agoUpdate user.consider_pd if confirmed
Anton Khorev [Sat, 18 Jan 2025 00:03:13 +0000 (03:03 +0300)]
Update user.consider_pd if confirmed

17 months agoAdd pd declaration create action
Anton Khorev [Fri, 17 Jan 2025 15:27:47 +0000 (18:27 +0300)]
Add pd declaration create action

17 months agoAdd confirm button to pd declaration page
Anton Khorev [Fri, 17 Jan 2025 15:09:47 +0000 (18:09 +0300)]
Add confirm button to pd declaration page

17 months agoAdd explanation link to pd declaration page
Anton Khorev [Fri, 17 Jan 2025 15:02:56 +0000 (18:02 +0300)]
Add explanation link to pd declaration page

17 months agoShow checkbox on pd declaration page
Anton Khorev [Fri, 17 Jan 2025 14:43:52 +0000 (17:43 +0300)]
Show checkbox on pd declaration page

17 months agoAdd empty pd declaration page
Anton Khorev [Fri, 17 Jan 2025 14:13:01 +0000 (17:13 +0300)]
Add empty pd declaration page

17 months agoMerge branch 'pull/5512'
Anton Khorev [Sat, 18 Jan 2025 15:23:51 +0000 (18:23 +0300)]
Merge branch 'pull/5512'

17 months agoMerge remote-tracking branch 'upstream/pull/5507'
Tom Hughes [Sat, 18 Jan 2025 12:06:58 +0000 (12:06 +0000)]
Merge remote-tracking branch 'upstream/pull/5507'

17 months agoUse the dark version of TransportMap in dark mode
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:24 +0000 (21:16 +0100)]
Use the dark version of TransportMap in dark mode

17 months agoDisable dark mode filtering by default
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:21 +0000 (21:16 +0100)]
Disable dark mode filtering by default

17 months agoAllow map layers to specify an alternate tile set for dark mode
Marwin Hochfelsner [Thu, 16 Jan 2025 20:16:14 +0000 (21:16 +0100)]
Allow map layers to specify an alternate tile set for dark mode

17 months agoMerge remote-tracking branch 'upstream/pull/5513'
Tom Hughes [Sat, 18 Jan 2025 11:45:38 +0000 (11:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5513'

17 months agoMerge remote-tracking branch 'upstream/pull/5510'
Tom Hughes [Sat, 18 Jan 2025 11:41:08 +0000 (11:41 +0000)]
Merge remote-tracking branch 'upstream/pull/5510'

17 months agoRemove "Public editing" line from settings page
Anton Khorev [Sat, 18 Jan 2025 00:32:57 +0000 (03:32 +0300)]
Remove "Public editing" line from settings page

17 months agoRename friends as followings
Tom Hughes [Fri, 17 Jan 2025 22:57:53 +0000 (22:57 +0000)]
Rename friends as followings

17 months agoRename friends rate limit as follows
Tom Hughes [Fri, 17 Jan 2025 22:56:48 +0000 (22:56 +0000)]
Rename friends rate limit as follows

17 months agoDrop rubocop exclusions that weren't doing anything
Tom Hughes [Fri, 17 Jan 2025 22:52:30 +0000 (22:52 +0000)]
Drop rubocop exclusions that weren't doing anything

17 months agoRename friendship_notification to follow_notification
Tom Hughes [Fri, 17 Jan 2025 22:48:48 +0000 (22:48 +0000)]
Rename friendship_notification to follow_notification

17 months agoRemove trailing whitespace from translation
Tom Hughes [Fri, 17 Jan 2025 22:48:12 +0000 (22:48 +0000)]
Remove trailing whitespace from translation

17 months agoRename friends_with to follows
Tom Hughes [Fri, 17 Jan 2025 22:42:35 +0000 (22:42 +0000)]
Rename friends_with to follows

17 months agoMerge pull request #5437 from AntonKhorev/user-status-resource
Andy Allan [Fri, 17 Jan 2025 17:55:02 +0000 (17:55 +0000)]
Merge pull request #5437 from AntonKhorev/user-status-resource

Use resourceful route for user status

17 months agoMerge pull request #5508 from AntonKhorev/fix-dashboard-follow
Andy Allan [Fri, 17 Jan 2025 17:53:51 +0000 (17:53 +0000)]
Merge pull request #5508 from AntonKhorev/fix-dashboard-follow

Fix missing translation of Follow links on dashboard

17 months agoMerge pull request #5509 from AntonKhorev/restore-follows-form
Andy Allan [Fri, 17 Jan 2025 17:53:00 +0000 (17:53 +0000)]
Merge pull request #5509 from AntonKhorev/restore-follows-form

Use form with normal-sized button on follows show pages

17 months agoAdds validating of notes foreign key
Nenad Vujicic [Mon, 13 Jan 2025 12:09:04 +0000 (13:09 +0100)]
Adds validating of notes foreign key

Adds migration for validation foreign key in notes table referencing users table.

17 months agoUse form with normal-sized button on follows show pages
Anton Khorev [Fri, 17 Jan 2025 02:28:59 +0000 (05:28 +0300)]
Use form with normal-sized button on follows show pages

17 months agoFix missing translation of Follow links on dashboard
Anton Khorev [Fri, 17 Jan 2025 02:09:05 +0000 (05:09 +0300)]
Fix missing translation of Follow links on dashboard

17 months agoMerge branch 'pull/5261'
Anton Khorev [Fri, 17 Jan 2025 01:01:22 +0000 (04:01 +0300)]
Merge branch 'pull/5261'

17 months agoBump allowed ECMAScript version to 2021 (ES12)
Tom Hughes [Thu, 16 Jan 2025 19:08:50 +0000 (19:08 +0000)]
Bump allowed ECMAScript version to 2021 (ES12)

17 months agoMerge remote-tracking branch 'upstream/pull/5500'
Tom Hughes [Thu, 16 Jan 2025 19:03:43 +0000 (19:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5500'

17 months agoMerge remote-tracking branch 'upstream/pull/5499'
Tom Hughes [Thu, 16 Jan 2025 18:38:36 +0000 (18:38 +0000)]
Merge remote-tracking branch 'upstream/pull/5499'

17 months agoMerge remote-tracking branch 'upstream/pull/5494'
Tom Hughes [Thu, 16 Jan 2025 18:35:36 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/5494'

17 months agoMerge remote-tracking branch 'upstream/pull/5506'
Tom Hughes [Thu, 16 Jan 2025 18:18:06 +0000 (18:18 +0000)]
Merge remote-tracking branch 'upstream/pull/5506'

17 months agoMerge remote-tracking branch 'upstream/pull/5502'
Tom Hughes [Thu, 16 Jan 2025 18:03:08 +0000 (18:03 +0000)]
Merge remote-tracking branch 'upstream/pull/5502'

17 months agoRemove account terms code unreachable for unregistered users
Anton Khorev [Thu, 16 Jan 2025 15:54:55 +0000 (18:54 +0300)]
Remove account terms code unreachable for unregistered users

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Jan 2025 12:13:45 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

17 months agoMerge branch 'pull/5503'
Anton Khorev [Thu, 16 Jan 2025 00:54:43 +0000 (03:54 +0300)]
Merge branch 'pull/5503'

17 months agoShow changeset element counts using badges
Anton Khorev [Mon, 3 Jun 2024 11:51:47 +0000 (14:51 +0300)]
Show changeset element counts using badges

17 months agoRemove type_and_paginated_count helper
Anton Khorev [Thu, 29 Aug 2024 13:18:40 +0000 (16:18 +0300)]
Remove type_and_paginated_count helper

17 months agoBump osm-community-index from 5.9.0 to 5.9.1
dependabot[bot] [Wed, 15 Jan 2025 23:45:56 +0000 (23:45 +0000)]
Bump osm-community-index from 5.9.0 to 5.9.1

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.9.0 to 5.9.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.9.0...v5.9.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 agoUse resourceful route for user status
Anton Khorev [Mon, 23 Dec 2024 02:55:14 +0000 (05:55 +0300)]
Use resourceful route for user status

17 months agoRemoved unused translations in preferences.show
Nenad Vujicic [Wed, 15 Jan 2025 16:45:22 +0000 (17:45 +0100)]
Removed unused translations in preferences.show

After merging 967e6d4 preferences.show.{preferred_editor, preferred_languages} are not used anymore.

17 months agoMerge pull request #5433 from AntonKhorev/user-routes-api-namespace
Andy Allan [Wed, 15 Jan 2025 12:55:41 +0000 (12:55 +0000)]
Merge pull request #5433 from AntonKhorev/user-routes-api-namespace

Resourceful routes for users api

17 months agoMerge pull request #5449 from AntonKhorev/edit-preferences
Andy Allan [Wed, 15 Jan 2025 12:49:34 +0000 (12:49 +0000)]
Merge pull request #5449 from AntonKhorev/edit-preferences

Make preferences page editable without clicking 'Edit Preferences'

17 months agoMerge pull request #5501 from openstreetmap/dependabot/npm_and_yarn/qs-6.14.0
Andy Allan [Wed, 15 Jan 2025 11:45:08 +0000 (11:45 +0000)]
Merge pull request #5501 from openstreetmap/dependabot/npm_and_yarn/qs-6.14.0

Bump qs from 6.13.1 to 6.14.0

17 months agoAdded unit tests for new Note methods
Nenad Vujicic [Mon, 13 Jan 2025 10:28:11 +0000 (11:28 +0100)]
Added unit tests for new Note methods

Added unit tests for new Note methods and updated system tests to use description instead of first comment's body.

17 months agoChanged note's first comment body to description
Nenad Vujicic [Tue, 14 Jan 2025 12:32:22 +0000 (13:32 +0100)]
Changed note's first comment body to description

Replaced using note's first comment body with note's description.

17 months agoBump qs from 6.13.1 to 6.14.0
dependabot[bot] [Tue, 14 Jan 2025 23:14:53 +0000 (23:14 +0000)]
Bump qs from 6.13.1 to 6.14.0

Bumps [qs](https://github.com/ljharb/qs) from 6.13.1 to 6.14.0.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.13.1...v6.14.0)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
17 months agoInstall add/remove event listeners directly on note layer
Anton Khorev [Tue, 14 Jan 2025 23:02:47 +0000 (02:02 +0300)]
Install add/remove event listeners directly on note layer

17 months agoMerge remote-tracking branch 'upstream/pull/5495'
Tom Hughes [Tue, 14 Jan 2025 19:05:09 +0000 (19:05 +0000)]
Merge remote-tracking branch 'upstream/pull/5495'

17 months agoMerge remote-tracking branch 'upstream/pull/5498'
Tom Hughes [Tue, 14 Jan 2025 18:45:19 +0000 (18:45 +0000)]
Merge remote-tracking branch 'upstream/pull/5498'

17 months agoFix new rubocop warnings
Tom Hughes [Tue, 14 Jan 2025 18:31:52 +0000 (18:31 +0000)]
Fix new rubocop warnings

17 months agoUpdate bundle
Tom Hughes [Tue, 14 Jan 2025 18:08:36 +0000 (18:08 +0000)]
Update bundle

17 months agoAdded description and author_id methods to Note
Nenad Vujicic [Mon, 13 Jan 2025 09:21:56 +0000 (10:21 +0100)]
Added description and author_id methods to Note

Added description and author_id (author_ip already exists) methods to Note model. They still use first comment (but will be soon replaced to use records from Note model).

17 months agoRemove references to OAuth 1 client_application model
Anton Khorev [Tue, 14 Jan 2025 11:55:25 +0000 (14:55 +0300)]
Remove references to OAuth 1 client_application model

17 months agoRefactor friendships controller and model
nertc [Tue, 14 Jan 2025 07:33:56 +0000 (11:33 +0400)]
Refactor friendships controller and model

17 months agoModify the way Friends are added
nertc [Tue, 14 Jan 2025 07:32:54 +0000 (11:32 +0400)]
Modify the way Friends are added

17 months agoTest that encouragement disappears after verified email signup
Anton Khorev [Mon, 13 Jan 2025 11:11:11 +0000 (14:11 +0300)]
Test that encouragement disappears after verified email signup

17 months agoTest that anonymous note encouragement disappears after signup
Anton Khorev [Mon, 13 Jan 2025 10:52:44 +0000 (13:52 +0300)]
Test that anonymous note encouragement disappears after signup