Commit graph

14692 commits

Author SHA1 Message Date
Andy Allan
10a4c5cf6e Rename Feeds::ChangesetCommentsController to ChangesetComments::FeedsController
We usually create nested controllers with the main controller as the module,
and the nested controller as the specialization, e.g. Users::DeletionsController
or Traces::IconsController.

This then leaves the topic of whether the feed resource is plural, and whether we
are then showing a singular feed or showing a list (index) of objects.

The routes are carefully named so that we have `changesets_comments_feed_path` (the
comments feed for all changesets) vs `changeset_comment_feed_path(changeset)` (the
comments for a singular changeset).
2024-08-28 18:31:36 +01:00
Andy Allan
a948f2bc24
Merge pull request #4587 from AntonKhorev/changeset-comment-routes
Move changeset comments feed to resourceful routes
2024-08-28 18:30:11 +01:00
Andy Allan
b9988bdbc8
Merge pull request #5093 from AntonKhorev/diary-comments-shallow-paths
Use shallow routes for diary comments
2024-08-28 14:58:53 +01:00
Andy Allan
6bc4b20731
Merge pull request #5034 from grischard/patch-4
Add planet link and explanation to robots.txt
2024-08-28 14:55:36 +01:00
Andy Allan
c073f15f5c
Merge pull request #5060 from tomhughes/rake-expiry
Move token expiry to a rake task
2024-08-28 14:54:31 +01:00
Tom Hughes
5841813b82 Merge remote-tracking branch 'upstream/pull/5057' 2024-08-27 19:07:47 +01:00
Tom Hughes
90e43e714f Update rubocop todo 2024-08-27 19:03:43 +01:00
Tom Hughes
a136b92761 Update bundle 2024-08-27 17:47:47 +01:00
nertc
3cf5667c91 Add turbo to Issues page 2024-08-27 11:50:43 +04:00
translatewiki.net
fd46c924ba
Localisation updates from https://translatewiki.net. 2024-08-26 14:15:06 +02:00
nertc
c32f6dd4ff Add pagination to Issues page 2024-08-26 13:57:44 +04:00
Tom Hughes
a45467d0bc Merge remote-tracking branch 'upstream/pull/5113' 2024-08-25 17:27:37 +01:00
dependabot[bot]
eced56495a
Bump eslint from 9.9.0 to 9.9.1
Bumps [eslint](https://github.com/eslint/eslint) from 9.9.0 to 9.9.1.
- [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/v9.9.0...v9.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-23 23:46:41 +00:00
Tom Hughes
fba6f95b39 Merge remote-tracking branch 'upstream/pull/5106' 2024-08-23 18:27:10 +01:00
Anton Khorev
3bba84ed3a Backfill block deactivates_at 2024-08-23 18:25:14 +01:00
Tom Hughes
ec5754a9bd Merge remote-tracking branch 'upstream/pull/5110' 2024-08-23 18:09:21 +01:00
Tom Hughes
dd1c07f609 Merge remote-tracking branch 'upstream/pull/5111' 2024-08-23 18:01:27 +01:00
Tom Hughes
6704a6a0dc Merge remote-tracking branch 'upstream/pull/5107' 2024-08-23 17:48:48 +01:00
Anton Khorev
4a38ab5c80 Move changeset comment feeds to resourceful routes 2024-08-23 18:14:19 +03:00
Anton Khorev
09d5ae68dd Move changeset comments controller to feeds module 2024-08-23 17:40:26 +03:00
Anton Khorev
52324cba89 Disable turbo on all links inside pagination frames except older/newer 2024-08-23 15:00:55 +03:00
Anton Khorev
258104dfdf Remove revoke block action 2024-08-23 13:34:08 +03:00
Anton Khorev
cc2a72bdd7 Remove revoke block pages 2024-08-23 13:23:29 +03:00
Anton Khorev
a448c9d0e0 Update block-api integration test to revoke block by editing 2024-08-23 13:11:32 +03:00
Anton Khorev
ed1e5ebe7d Remove revoke buttons from block show pages 2024-08-23 13:01:20 +03:00
Anton Khorev
1baf64e7bc Remove revoke buttons from block lists 2024-08-23 12:55:53 +03:00
Anton Khorev
3a8b8af53b Stop testing revoke block buttons 2024-08-23 12:55:20 +03:00
Tom Hughes
30f975c609 Update bundle 2024-08-22 22:18:32 +01:00
Tom Hughes
40c46a2ab8 Merge remote-tracking branch 'upstream/pull/5104' 2024-08-22 18:06:09 +01:00
Anton Khorev
22841f5908 Convert dashboard test into a system test
Allows to remove an id used only for testing.
2024-08-22 17:47:26 +03:00
Anton Khorev
9dcc5639fd Change dashboard heading levels 2024-08-22 17:42:24 +03:00
Anton Khorev
b71425f4b2 Remove outdated test for friends in users controller 2024-08-22 17:41:50 +03:00
translatewiki.net
ceb87bb9cf
Localisation updates from https://translatewiki.net. 2024-08-22 14:19:11 +02:00
Anton Khorev
76736bab4f Change submit button on block edit page when can only revoke 2024-08-22 14:01:54 +03:00
Anton Khorev
11a7bf7e0e Remove duration controls for blocks that can only be revoked by editing 2024-08-22 14:01:54 +03:00
Anton Khorev
5e7ab68721 Let all moderators revoke blocks by editing 2024-08-22 14:01:54 +03:00
Anton Khorev
67a5809c8a Show edit buttons on active blocks to all moderators 2024-08-22 14:01:54 +03:00
Anton Khorev
ae3e804ee6 Add update block ability with conditions 2024-08-22 14:01:54 +03:00
Andy Allan
8dc5de1a0f
Merge pull request #4646 from tomhughes/turbo-pagination
Use turbo for pagination
2024-08-21 19:12:31 +01:00
Tom Hughes
754a0a9cb5 Merge remote-tracking branch 'upstream/pull/5069' 2024-08-21 19:04:06 +01:00
Tom Hughes
cd36a388c2 Merge remote-tracking branch 'upstream/pull/5101' 2024-08-21 18:32:39 +01:00
Tom Hughes
be6a8eb2b3 Merge remote-tracking branch 'upstream/pull/5102' 2024-08-21 18:22:02 +01:00
Andy Allan
ca2c7ef1d6
Merge pull request #5100 from tomhughes/overcommit
Add overcommit to manage git hooks
2024-08-21 17:09:17 +01:00
Martin Raifer
60f7439bf5
upgrade to iD-2.30.2 (rotated Mapbox API tokens) 2024-08-21 17:35:19 +02:00
Martin Raifer
9969bc5a24
Update to iD v2.30.1 2024-08-21 11:28:06 +02:00
Anton Khorev
1e9603c7b1 Remove endpoint/input values on disable 2024-08-21 11:43:26 +03:00
Tom Hughes
bb2eccf658 Add overcommit to manage git hooks 2024-08-21 08:20:10 +01:00
Tom Hughes
20f8fadd7b Merge remote-tracking branch 'upstream/pull/5099' 2024-08-20 19:12:13 +01:00
Tom Hughes
9bee66107a Update bundle 2024-08-20 18:09:58 +01:00
Tom Hughes
edddaab122 Use turbo for pagination 2024-08-20 14:44:10 +01:00