]> git.openstreetmap.org Git - rails.git/log
rails.git
2 months agoAttempt to get danger working as a CI workflow
Tom Hughes [Thu, 17 Oct 2024 17:41:05 +0000 (18:41 +0100)]
Attempt to get danger working as a CI workflow

References #5267

2 months agoMerge remote-tracking branch 'upstream/pull/5268'
Tom Hughes [Thu, 17 Oct 2024 17:10:04 +0000 (18:10 +0100)]
Merge remote-tracking branch 'upstream/pull/5268'

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Oct 2024 12:16:07 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoBump coverallsapp/github-action from 2.3.2 to 2.3.3
dependabot[bot] [Wed, 16 Oct 2024 23:06:28 +0000 (23:06 +0000)]
Bump coverallsapp/github-action from 2.3.2 to 2.3.3

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.2...v2.3.3)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoUpdate to rails 7.2.1.1
Tom Hughes [Wed, 16 Oct 2024 18:05:50 +0000 (19:05 +0100)]
Update to rails 7.2.1.1

2 months agoMerge remote-tracking branch 'upstream/pull/5246'
Tom Hughes [Wed, 16 Oct 2024 18:05:18 +0000 (19:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5246'

2 months agoMerge remote-tracking branch 'upstream/pull/5266'
Tom Hughes [Wed, 16 Oct 2024 17:38:48 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5266'

2 months agoAvoid linking to redirects on the osmfoundation website
Andy Allan [Wed, 16 Oct 2024 16:40:24 +0000 (17:40 +0100)]
Avoid linking to redirects on the osmfoundation website

2 months agoMerge pull request #4919 from rkoeze/rkoeze/add-github-pr-template
Andy Allan [Wed, 16 Oct 2024 16:19:41 +0000 (17:19 +0100)]
Merge pull request #4919 from rkoeze/rkoeze/add-github-pr-template

Add pull request template

2 months agoMerge pull request #5216 from kcne/teaspoon-v2
Andy Allan [Wed, 16 Oct 2024 15:55:33 +0000 (16:55 +0100)]
Merge pull request #5216 from kcne/teaspoon-v2

Re-enable JavaScript unit tests using Teaspoon

2 months agoMerge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling
Andy Allan [Wed, 16 Oct 2024 13:29:59 +0000 (14:29 +0100)]
Merge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling

Added workflow for PR labeling using Danger

2 months agoRephrase translation label, and fix link to docs
Andy Allan [Wed, 16 Oct 2024 13:29:39 +0000 (14:29 +0100)]
Rephrase translation label, and fix link to docs

2 months agoMerge remote-tracking branch 'upstream/pull/5263'
Tom Hughes [Tue, 15 Oct 2024 23:32:52 +0000 (00:32 +0100)]
Merge remote-tracking branch 'upstream/pull/5263'

2 months agoBump coverallsapp/github-action from 2.3.0 to 2.3.2
dependabot[bot] [Tue, 15 Oct 2024 23:20:06 +0000 (23:20 +0000)]
Bump coverallsapp/github-action from 2.3.0 to 2.3.2

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.0 to 2.3.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.3.0...v2.3.2)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoKeep zeitwerk at 2.6 for ruby 3.1 support
Tom Hughes [Tue, 15 Oct 2024 17:38:21 +0000 (18:38 +0100)]
Keep zeitwerk at 2.6 for ruby 3.1 support

2 months agoFix new rubocop warnings
Tom Hughes [Tue, 15 Oct 2024 17:25:30 +0000 (18:25 +0100)]
Fix new rubocop warnings

2 months agoUpdate bundle
Tom Hughes [Tue, 15 Oct 2024 17:22:24 +0000 (18:22 +0100)]
Update bundle

2 months agoMerge branch 'pull/5260'
Anton Khorev [Tue, 15 Oct 2024 11:19:25 +0000 (14:19 +0300)]
Merge branch 'pull/5260'

2 months agoRemove Nominatim prefixes mention in contributors guide
mmd-osm [Mon, 14 Oct 2024 21:44:38 +0000 (23:44 +0200)]
Remove Nominatim prefixes mention in contributors guide

See https://github.com/openstreetmap/openstreetmap-website/issues/5258#issuecomment-2410282588

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Oct 2024 12:15:53 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoEnable eslint and fix eslint errors for osm_test.js
Emin Kocan [Sat, 14 Sep 2024 14:47:42 +0000 (16:47 +0200)]
Enable eslint and fix eslint errors for osm_test.js

2 months agoAdd step for creation tmp/pids in test workflow
Emin Kocan [Sat, 14 Sep 2024 13:36:34 +0000 (15:36 +0200)]
Add step for creation tmp/pids in test workflow

2 months agoDisable eslint for js test files to test for github-ci
Emin Kocan [Sat, 14 Sep 2024 13:21:47 +0000 (15:21 +0200)]
Disable eslint for js test files to test for github-ci

2 months agoUse chai assertion style
Emin Kocan [Sat, 14 Sep 2024 12:39:42 +0000 (14:39 +0200)]
Use chai assertion style

2 months agoSelenium driver working on local
Emin Kocan [Wed, 11 Sep 2024 23:54:31 +0000 (01:54 +0200)]
Selenium driver working on local

2 months agoRun javascript tests in CI
Andy Allan [Wed, 4 Jan 2023 15:23:50 +0000 (15:23 +0000)]
Run javascript tests in CI

2 months agoUse teaspoon to run javascript tests
Andy Allan [Wed, 4 Jan 2023 15:21:44 +0000 (15:21 +0000)]
Use teaspoon to run javascript tests

Refs #2595

2 months agoMerge remote-tracking branch 'upstream/pull/5254'
Tom Hughes [Wed, 9 Oct 2024 18:14:42 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/5254'

2 months agoUpdate link for Austria data sources
mmd-osm [Wed, 9 Oct 2024 15:54:35 +0000 (17:54 +0200)]
Update link for Austria data sources

Fixes #5253. As requested by LWG.

2 months agoMerge remote-tracking branch 'upstream/pull/5250'
Tom Hughes [Tue, 8 Oct 2024 17:39:07 +0000 (18:39 +0100)]
Merge remote-tracking branch 'upstream/pull/5250'

2 months agoUpdate bundle
Tom Hughes [Tue, 8 Oct 2024 17:35:47 +0000 (18:35 +0100)]
Update bundle

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Oct 2024 12:15:25 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoUpdate to iD v2.30.4
Martin Raifer [Mon, 7 Oct 2024 10:09:32 +0000 (12:09 +0200)]
Update to iD v2.30.4

2 months agoAdded workflow for PR labeling using Danger
Nenad Vujicic [Mon, 7 Oct 2024 09:13:18 +0000 (11:13 +0200)]
Added workflow for PR labeling using Danger

Workflow is called when PR is created or updated. It checks if PR is too big (>500 changed lines), changes one of translation files (YML, except en.yml) or contains merge-commits and generates appropriate labels.

2 months agoMerge remote-tracking branch 'upstream/pull/5249'
Tom Hughes [Sun, 6 Oct 2024 17:35:50 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/5249'

2 months agoBump eslint from 9.11.1 to 9.12.0
dependabot[bot] [Fri, 4 Oct 2024 23:24:29 +0000 (23:24 +0000)]
Bump eslint from 9.11.1 to 9.12.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.11.1 to 9.12.0.
- [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.11.1...v9.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoMerge remote-tracking branch 'upstream/pull/5248'
Tom Hughes [Thu, 3 Oct 2024 16:53:32 +0000 (17:53 +0100)]
Merge remote-tracking branch 'upstream/pull/5248'

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Oct 2024 12:14:59 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoMerge pull request #5247 from tomhughes/rails-72-defaults
Andy Allan [Thu, 3 Oct 2024 10:58:19 +0000 (11:58 +0100)]
Merge pull request #5247 from tomhughes/rails-72-defaults

Switch to rails 7.2 defaults

2 months agoSwitch to rails 7.2 defaults
Tom Hughes [Wed, 2 Oct 2024 18:16:37 +0000 (19:16 +0100)]
Switch to rails 7.2 defaults

2 months agoMerge remote-tracking branch 'upstream/pull/5245'
Tom Hughes [Wed, 2 Oct 2024 17:36:03 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/5245'

2 months agoBundle update for rails 7.2.1
Andy Allan [Wed, 2 Oct 2024 16:16:21 +0000 (17:16 +0100)]
Bundle update for rails 7.2.1

2 months agoSwitch to canonical-rails from master, with rails 7.2.1+ compatibility
Andy Allan [Wed, 2 Oct 2024 16:15:54 +0000 (17:15 +0100)]
Switch to canonical-rails from master, with rails 7.2.1+ compatibility

2 months agoMerge pull request #5070 from tomhughes/rails72
Andy Allan [Wed, 2 Oct 2024 16:00:26 +0000 (17:00 +0100)]
Merge pull request #5070 from tomhughes/rails72

Update to rails 7.2.0

2 months agoMove api error handling and timeouts to parent class
Andy Allan [Wed, 2 Oct 2024 15:37:32 +0000 (16:37 +0100)]
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

2 months agoUpdate to iD v2.30.3
Martin Raifer [Wed, 2 Oct 2024 13:13:25 +0000 (15:13 +0200)]
Update to iD v2.30.3

2 months agoMerge remote-tracking branch 'upstream/pull/5242'
Tom Hughes [Tue, 1 Oct 2024 18:14:01 +0000 (19:14 +0100)]
Merge remote-tracking branch 'upstream/pull/5242'

2 months agoUpdate bundle
Tom Hughes [Tue, 1 Oct 2024 18:12:23 +0000 (19:12 +0100)]
Update bundle

2 months agoIgnores activerecord translation keys as unused
Nenad Vujicic [Mon, 30 Sep 2024 15:10:15 +0000 (17:10 +0200)]
Ignores activerecord translation keys as unused

Adds activerecord.errors.models.user_mute.{attributes.subject.format, is_already_muted} under ignore_unused (in i18n-tasks.yml) so they are not reported as unused anymore.

2 months agoMerge remote-tracking branch 'upstream/pull/5243'
Tom Hughes [Mon, 30 Sep 2024 18:15:10 +0000 (19:15 +0100)]
Merge remote-tracking branch 'upstream/pull/5243'

2 months agoMerge remote-tracking branch 'upstream/pull/5241'
Tom Hughes [Mon, 30 Sep 2024 18:08:12 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/pull/5241'

2 months agoMasked off reporting as unused various keys
Nenad Vujicic [Mon, 30 Sep 2024 15:52:33 +0000 (17:52 +0200)]
Masked off reporting as unused various keys

Added time.formats.{blog, friendly} translation keys under ignore_unused in i18n-tasks.yml since used on numerous places for formatting dates / times, removed site.sidebar.close because started being used at 3a51160 and ended being used at 6adcce4, removed sessions.new.title because started being used at f18baae and has been used only in test/system/issues_test.rb (from which we removed it because tests are always in EN)

2 months agoRemoved unused translations in user_blocks
Nenad Vujicic [Tue, 24 Sep 2024 10:23:12 +0000 (12:23 +0200)]
Removed unused translations in user_blocks

Removed user_blocks.show.{confirm, needs_view, show} translation keys added at daa2496. confirm and show has never been used, needs_view ended being used at ca06b3c.

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 Sep 2024 12:15:17 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Sep 2024 12:18:48 +0000 (14:18 +0200)]
Localisation updates from https://translatewiki.net.

2 months agoMerge remote-tracking branch 'upstream/pull/5238'
Tom Hughes [Wed, 25 Sep 2024 17:26:39 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/5238'

2 months agoRemoved various unused translation keys
Nenad Vujicic [Tue, 24 Sep 2024 10:32:21 +0000 (12:32 +0200)]
Removed various unused translation keys

Removed changeset_comments.feeds.comments.comment (5cd417f / 2cf3861), issues.index.link_to_reports (79bd177 / 05ae075) and sessions.new.register now (5197124 / 9649b19) translation keys.

2 months agoUpdate bundle
Tom Hughes [Tue, 24 Sep 2024 17:14:08 +0000 (18:14 +0100)]
Update bundle

2 months agoMerge remote-tracking branch 'upstream/pull/5237'
Tom Hughes [Tue, 24 Sep 2024 17:13:28 +0000 (18:13 +0100)]
Merge remote-tracking branch 'upstream/pull/5237'

2 months agoBump webrick from 1.8.1 to 1.8.2
dependabot[bot] [Tue, 24 Sep 2024 17:12:13 +0000 (17:12 +0000)]
Bump webrick from 1.8.1 to 1.8.2

Bumps [webrick](https://github.com/ruby/webrick) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/ruby/webrick/releases)
- [Commits](https://github.com/ruby/webrick/compare/v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: webrick
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2 months agoMerge remote-tracking branch 'upstream/pull/5236'
Tom Hughes [Tue, 24 Sep 2024 17:07:47 +0000 (18:07 +0100)]
Merge remote-tracking branch 'upstream/pull/5236'

2 months agoMerge remote-tracking branch 'upstream/pull/5235'
Tom Hughes [Tue, 24 Sep 2024 17:06:20 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5235'

2 months agoMerge remote-tracking branch 'upstream/pull/5234'
Tom Hughes [Tue, 24 Sep 2024 17:04:39 +0000 (18:04 +0100)]
Merge remote-tracking branch 'upstream/pull/5234'

2 months agoRemoved unused translation keys in users.*
Nenad Vujicic [Mon, 23 Sep 2024 22:06:27 +0000 (00:06 +0200)]
Removed unused translation keys in users.*

Removed users.new.tou (added 9649b19 and has never been used), users.terms.decline replaced with users.terms.cancel and together with users.terms.continue started being used at /users/terms.html.erb (both were added at 9a9e13a and removed at 1be8d59)

2 months agoFixed unused translation keys in diary_entries.*
Nenad Vujicic [Mon, 23 Sep 2024 22:27:17 +0000 (00:27 +0200)]
Fixed unused translation keys in diary_entries.*

Removed diary_entries.location.{edit,view} unused translation keys. They were started using at 0b913ef and ended using at 53fc3e8 / aa121fa.

3 months agoBump eslint from 9.11.0 to 9.11.1
dependabot[bot] [Mon, 23 Sep 2024 23:11:16 +0000 (23:11 +0000)]
Bump eslint from 9.11.0 to 9.11.1

Bumps [eslint](https://github.com/eslint/eslint) from 9.11.0 to 9.11.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.11.0...v9.11.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Sep 2024 12:15:17 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoMerge remote-tracking branch 'upstream/pull/5232'
Tom Hughes [Sun, 22 Sep 2024 16:08:47 +0000 (17:08 +0100)]
Merge remote-tracking branch 'upstream/pull/5232'

3 months agoMerge remote-tracking branch 'upstream/pull/5231'
Tom Hughes [Sun, 22 Sep 2024 16:07:45 +0000 (17:07 +0100)]
Merge remote-tracking branch 'upstream/pull/5231'

3 months agoTrace import: validate background job results
mmd-osm [Sat, 21 Sep 2024 20:30:30 +0000 (22:30 +0200)]
Trace import: validate background job results

3 months agoOCI: ignore invalid replacement token
mmd-osm [Sat, 21 Sep 2024 07:17:03 +0000 (09:17 +0200)]
OCI: ignore invalid replacement token

3 months agoMerge remote-tracking branch 'upstream/pull/5230'
Tom Hughes [Fri, 20 Sep 2024 23:18:54 +0000 (00:18 +0100)]
Merge remote-tracking branch 'upstream/pull/5230'

3 months agoBump eslint from 9.10.0 to 9.11.0
dependabot[bot] [Fri, 20 Sep 2024 23:10:43 +0000 (23:10 +0000)]
Bump eslint from 9.10.0 to 9.11.0

Bumps [eslint](https://github.com/eslint/eslint) from 9.10.0 to 9.11.0.
- [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.10.0...v9.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
3 months agoMerge branch 'pull/5228'
Anton Khorev [Fri, 20 Sep 2024 22:56:25 +0000 (01:56 +0300)]
Merge branch 'pull/5228'

3 months agoMerge remote-tracking branch 'upstream/pull/5229'
Tom Hughes [Fri, 20 Sep 2024 21:38:26 +0000 (22:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5229'

3 months agoBump puma from 5.6.8 to 5.6.9
dependabot[bot] [Fri, 20 Sep 2024 19:25:11 +0000 (19:25 +0000)]
Bump puma from 5.6.8 to 5.6.9

Bumps [puma](https://github.com/puma/puma) from 5.6.8 to 5.6.9.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.8...v5.6.9)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
3 months agoDrop ignore of removed creation_ip column
Tom Hughes [Fri, 20 Sep 2024 18:21:58 +0000 (19:21 +0100)]
Drop ignore of removed creation_ip column

3 months agoMerge remote-tracking branch 'upstream/pull/5226'
Tom Hughes [Fri, 20 Sep 2024 18:19:13 +0000 (19:19 +0100)]
Merge remote-tracking branch 'upstream/pull/5226'

3 months agoMerge remote-tracking branch 'upstream/pull/5223'
Tom Hughes [Fri, 20 Sep 2024 18:18:11 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/5223'

3 months agoDon't include stack backtraces on xml errors when importing traces
Anton Khorev [Thu, 19 Sep 2024 15:38:50 +0000 (18:38 +0300)]
Don't include stack backtraces on xml errors when importing traces

3 months agoSuppress writing xml parse errors to stderr
Anton Khorev [Fri, 20 Sep 2024 13:33:20 +0000 (16:33 +0300)]
Suppress writing xml parse errors to stderr

3 months agoRemoved unused translation keys from changesets.*
Nenad Vujicic [Wed, 18 Sep 2024 20:59:54 +0000 (22:59 +0200)]
Removed unused translation keys from changesets.*

Removed unused translation keys changesets.{changeset.anonymous, no_such_entry.title} from en.yml. .anonymous was added in fddda4e and was stopped being used in 3e305fb. .title was added in f0764d3 but never used.

3 months agoMerge remote-tracking branch 'upstream/pull/5225'
Tom Hughes [Thu, 19 Sep 2024 17:05:14 +0000 (18:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5225'

3 months agoMerge remote-tracking branch 'upstream/pull/5227'
Tom Hughes [Thu, 19 Sep 2024 17:04:00 +0000 (18:04 +0100)]
Merge remote-tracking branch 'upstream/pull/5227'

3 months agoBump google-protobuf from 3.25.4 to 3.25.5
dependabot[bot] [Thu, 19 Sep 2024 16:28:30 +0000 (16:28 +0000)]
Bump google-protobuf from 3.25.4 to 3.25.5

Bumps [google-protobuf](https://github.com/protocolbuffers/protobuf) from 3.25.4 to 3.25.5.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.4...v3.25.5)

---
updated-dependencies:
- dependency-name: google-protobuf
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
3 months agoMerge branch 'pull/5117'
Anton Khorev [Thu, 19 Sep 2024 13:49:29 +0000 (16:49 +0300)]
Merge branch 'pull/5117'

3 months agoDon't use ?: in "Comment from user" changeset discussion strings
Anton Khorev [Thu, 19 Sep 2024 12:58:07 +0000 (15:58 +0300)]
Don't use ?: in "Comment from user" changeset discussion strings

3 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Sep 2024 12:14:54 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.

3 months agoMerge branch 'pull/5209'
Anton Khorev [Wed, 18 Sep 2024 12:28:13 +0000 (15:28 +0300)]
Merge branch 'pull/5209'

3 months agoMerge remote-tracking branch 'upstream/pull/5221'
Tom Hughes [Wed, 18 Sep 2024 08:32:29 +0000 (09:32 +0100)]
Merge remote-tracking branch 'upstream/pull/5221'

3 months agoMerge remote-tracking branch 'upstream/pull/5220'
Tom Hughes [Wed, 18 Sep 2024 08:31:53 +0000 (09:31 +0100)]
Merge remote-tracking branch 'upstream/pull/5220'

3 months agoAdded greeting to friendship notification
Nenad Vujicic [Tue, 17 Sep 2024 21:20:41 +0000 (23:20 +0200)]
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.

3 months agoFix warnings about tests with no assertions
Tom Hughes [Wed, 4 Sep 2024 18:07:00 +0000 (19:07 +0100)]
Fix warnings about tests with no assertions

3 months agoUpdate to rails 7.2.0
Tom Hughes [Tue, 13 Aug 2024 17:20:47 +0000 (18:20 +0100)]
Update to rails 7.2.0

3 months agoDrop support for ruby 3.0
Tom Hughes [Tue, 13 Aug 2024 20:05:51 +0000 (21:05 +0100)]
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.

3 months agoUpdate bundle
Tom Hughes [Tue, 17 Sep 2024 17:57:42 +0000 (18:57 +0100)]
Update bundle

3 months agoRemove unnecessary comma from several translatable messages
Amir E. Aharoni [Tue, 17 Sep 2024 14:46:18 +0000 (10:46 -0400)]
Remove unnecessary comma from several translatable messages

3 months agoMerge branch 'pull/5212'
Anton Khorev [Tue, 17 Sep 2024 12:26:19 +0000 (15:26 +0300)]
Merge branch 'pull/5212'

3 months agoDrop creation_ip column
Tom Hughes [Fri, 13 Sep 2024 17:23:50 +0000 (18:23 +0100)]
Drop creation_ip column

3 months agoMerge branch 'pull/5218'
Anton Khorev [Mon, 16 Sep 2024 12:17:27 +0000 (15:17 +0300)]
Merge branch 'pull/5218'