Jakob Miksch
4f79ae4612
Typos in docs
2024-10-20 11:12:49 +02:00
Tom Hughes
99f220cf69
Fix new rubocop warnings
2024-10-15 18:25:30 +01:00
Tom Hughes
ad2e50fcfb
Merge remote-tracking branch 'upstream/pull/5245'
2024-10-02 18:36:03 +01:00
Andy Allan
5720968323
Merge pull request #5070 from tomhughes/rails72
...
Update to rails 7.2.0
2024-10-02 17:00:26 +01:00
Andy Allan
83425edd8d
Move api error handling and timeouts to parent class
...
Fixes #4861
Since the around_action is defined before authorize_resource is called,
the handler needs to pass on the CanCan::AccessDenied exception.
I've added the timeouts where I think they were missing (e.g. UserPreferencesController)
but I've kept the exception for changeset#upload and traces#create
2024-10-02 16:37:32 +01:00
Nenad Vujicic
b0ad96ebd4
Removed unused translation keys in users.*
...
Removed users.new.tou (added 9649b199a9e13a1be8d59
2024-09-24 16:03:23 +02:00
Tom Hughes
81bb20c3e6
Drop ignore of removed creation_ip column
2024-09-20 19:21:58 +01:00
Anton Khorev
81bac0b09b
Don't include stack backtraces on xml errors when importing traces
2024-09-20 16:36:54 +03:00
Tom Hughes
578a3aebaf
Merge remote-tracking branch 'upstream/pull/5225'
2024-09-19 18:05:14 +01:00
Anton Khorev
6595d43e3c
Merge branch 'pull/5117'
2024-09-19 16:49:29 +03:00
Anton Khorev
1c88a0b136
Don't use ?: in "Comment from user" changeset discussion strings
2024-09-19 15:59:03 +03:00
Anton Khorev
f90c7c4970
Merge branch 'pull/5209'
2024-09-18 15:28:13 +03:00
Nenad Vujicic
091bf88a5f
Added greeting to friendship notification
...
Added greeting 'Hi {user display name},' to friendship notification email. As a side effect, user_mailer.friendship_notification.hi is not anymore reported as unused.
2024-09-17 23:20:41 +02:00
Tom Hughes
be2678e0dd
Update to rails 7.2.0
2024-09-17 20:39:31 +01:00
Tom Hughes
6789fc3081
Drop support for ruby 3.0
...
Also add Ubuntu 24.04 and drop 20.04 as 24.04 is needed for
ruby 3.1 without rvm so we should test it.
2024-09-17 20:39:22 +01:00
Tom Hughes
5bac49c51f
Ignore the creation_ip column which is no longer used
2024-09-15 21:39:25 +01:00
Tom Hughes
fe96c0a524
Replace creation_ip with creation_address
2024-09-15 19:38:21 +01:00
Tom Hughes
33c0e95ebe
Merge remote-tracking branch 'upstream/pull/5203'
2024-09-15 19:30:22 +01:00
Tom Hughes
3025500b9c
Merge remote-tracking branch 'upstream/pull/5214'
2024-09-15 19:08:31 +01:00
Nenad Vujicic
8d77891fd6
Show friend options only when user is logged in
...
Fixes #5199 . Displays "Add Friend" and "Unfriend" links (buttons) on user profile page only if user is logged-in.
2024-09-14 22:48:31 +02:00
Anton Khorev
ed74bc036b
Fix browse elements timeouts
2024-09-14 18:03:48 +03:00
Anton Khorev
54c0361744
Always show changeset element page links below headings
2024-09-14 17:15:11 +03:00
Tom Hughes
25dbc4d43e
Merge remote-tracking branch 'upstream/pull/5211'
2024-09-14 10:55:50 +01:00
Tom Hughes
70f1b327b4
Merge remote-tracking branch 'upstream/pull/5178'
2024-09-13 18:09:37 +01:00
Anton Khorev
4e97231269
Fix element pagination width calculation
2024-09-13 18:50:22 +03:00
Anton Khorev
e47187a8fb
Merge branch 'pull/5206'
2024-09-13 12:18:17 +03:00
Anton Khorev
b81d645f0c
Merge branch 'pull/5196'
2024-09-13 11:48:38 +03:00
Tom Hughes
b969c6f7ab
Order changeset elements for consistent pagination
2024-09-12 22:56:29 +01:00
Tom Hughes
6d49bc6ebb
Make select all checkbox on users list work with turbo
2024-09-12 19:10:26 +01:00
Tom Hughes
b70770f8dd
Remove last traces of OPNVKarte layer
2024-09-12 18:29:55 +01:00
Anton Khorev
9c93fe906d
Fix friendships limit flash message
2024-09-12 15:42:36 +03:00
Anton Khorev
e2a6701696
Merge branch 'pull/5182'
2024-09-12 09:43:56 +03:00
Tom Hughes
e22d19f004
Limit the number of users counted for users#index
...
This view uses cursor based pagination but then undermines
that by counting the total number of users so limit the effect
of that but counting a maximum of ten pages of users.
2024-09-11 18:28:35 +01:00
Tom Hughes
17bea98e19
Merge remote-tracking branch 'upstream/pull/5189'
2024-09-11 17:13:56 +01:00
Tom Hughes
b34e71f1d9
Merge remote-tracking branch 'upstream/pull/5186'
2024-09-11 17:12:13 +01:00
Tom Hughes
36f984286e
Merge remote-tracking branch 'upstream/pull/5185'
2024-09-11 17:06:54 +01:00
Tom Hughes
c6e12b541b
Merge remote-tracking branch 'upstream/pull/5184'
2024-09-11 17:06:15 +01:00
Anton Khorev
138988860c
Replace 'remove this redaction' confirmation and request with Turbo
2024-09-11 17:43:37 +03:00
Nenad Vujicic
02b4aea509
Pulled out ?: operator from tr in changesets/index
...
Pulled out ?: operator from tr in changesets/index.html.erb, so, changesets.index.{empty, empty_area, empty_user, no_more, no_more_area, no_more_user} translation keys are not more reported as unused.
2024-09-11 13:23:19 +02:00
Anton Khorev
418615bce7
Add New Redaction button to redactions page
2024-09-11 14:14:35 +03:00
Anton Khorev
b31b8fe067
Remove :new abilities implied by :create abilities
2024-09-11 13:57:22 +03:00
Anton Khorev
de344eea83
Rename _blocks partial template to _page
2024-09-11 13:38:02 +03:00
Tom Hughes
336ad6db03
Add creation_address column to users
...
This is a properly typed and indexed column that is intended
to replace creation_ip to allow fast queries.
2024-09-10 19:16:03 +01:00
Tom Hughes
1a5fb52c28
Merge remote-tracking branch 'upstream/pull/5116'
2024-09-10 18:42:21 +01:00
Tom Hughes
091e0c21ef
Merge remote-tracking branch 'upstream/pull/5150'
2024-09-10 18:42:21 +01:00
Tom Hughes
039b3e1c32
Merge remote-tracking branch 'upstream/pull/5180'
2024-09-10 18:42:21 +01:00
Tom Hughes
173ed570b9
Merge remote-tracking branch 'upstream/pull/5179'
2024-09-10 18:42:20 +01:00
Tom Hughes
95d99d0faf
Merge remote-tracking branch 'upstream/pull/5168'
2024-09-10 18:42:19 +01:00
Anton Khorev
28886a1ba3
Mark flash messages as temporary
2024-09-10 12:24:08 +03:00
Anton Khorev
7d1b73ea93
Refactor flash template
2024-09-10 12:13:22 +03:00
