]>
git.openstreetmap.org Git - rails.git/log
Anton Khorev [Wed, 25 Oct 2023 12:02:28 +0000 (15:02 +0300)]
Apply unread message background to table cells
Required after updating Bootstrap.
Tom Hughes [Tue, 24 Oct 2023 16:37:48 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4262'
Andy Allan [Wed, 20 Sep 2023 15:15:04 +0000 (16:15 +0100)]
Upgrade to bootstrap 5.3
Tom Hughes [Tue, 24 Oct 2023 16:26:39 +0000 (17:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4309'
Tom Hughes [Tue, 24 Oct 2023 16:09:39 +0000 (17:09 +0100)]
Update bundle
Mateusz Konieczny [Mon, 23 Oct 2023 19:50:22 +0000 (21:50 +0200)]
rerun script/misc/update-wiki-pages
translatewiki.net [Mon, 23 Oct 2023 11:21:59 +0000 (13:21 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 21 Oct 2023 10:05:04 +0000 (11:05 +0100)]
Merge remote-tracking branch 'upstream/pull/4305'
Tom Hughes [Sat, 21 Oct 2023 10:04:10 +0000 (11:04 +0100)]
Merge remote-tracking branch 'upstream/pull/4306'
dependabot[bot] [Fri, 20 Oct 2023 23:43:06 +0000 (23:43 +0000)]
Bump eslint from 8.51.0 to 8.52.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.51.0 to 8.52.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/v8.51.0...v8.52.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Anton Khorev [Fri, 20 Oct 2023 17:42:38 +0000 (20:42 +0300)]
Remove user list custom css
Tom Hughes [Fri, 20 Oct 2023 16:11:13 +0000 (17:11 +0100)]
Merge remote-tracking branch 'upstream/pull/4304'
Tom Hughes [Fri, 20 Oct 2023 16:07:07 +0000 (17:07 +0100)]
Merge remote-tracking branch 'upstream/pull/4303'
Tom Hughes [Fri, 20 Oct 2023 16:01:03 +0000 (17:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4302'
Anton Khorev [Fri, 20 Oct 2023 14:54:51 +0000 (17:54 +0300)]
Remove oauth list custom css
Anton Khorev [Fri, 20 Oct 2023 14:26:51 +0000 (17:26 +0300)]
Remove some print-related custom css
Anton Khorev [Fri, 20 Oct 2023 13:38:25 +0000 (16:38 +0300)]
Remove some search/directions custom css
translatewiki.net [Thu, 19 Oct 2023 11:20:13 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 18 Oct 2023 17:51:16 +0000 (18:51 +0100)]
Merge pull request #4278 from tomhughes/rails71
Upgrade to rails 7.1.1
Tom Hughes [Sat, 7 Oct 2023 11:39:01 +0000 (12:39 +0100)]
Update database structure for change in migration ordering
Tom Hughes [Sat, 7 Oct 2023 10:44:38 +0000 (11:44 +0100)]
Update test results for changes to rescuable exception handling
https://github.com/rails/rails/pull/45867
Tom Hughes [Fri, 6 Oct 2023 21:19:22 +0000 (22:19 +0100)]
Fix test as rails no longer seems to return a body for redirects
Tom Hughes [Fri, 6 Oct 2023 21:18:30 +0000 (22:18 +0100)]
Adjust code for rails internal changes
Tom Hughes [Fri, 6 Oct 2023 21:13:50 +0000 (22:13 +0100)]
Replace composite_primary_keys with rails builtin support
Tom Hughes [Wed, 18 Oct 2023 16:36:53 +0000 (17:36 +0100)]
Use db:schema:load to populate the database when linting annotations
Tom Hughes [Fri, 6 Oct 2023 21:12:21 +0000 (22:12 +0100)]
Update to rails 7.1.1
Andy Allan [Wed, 18 Oct 2023 15:25:27 +0000 (16:25 +0100)]
Merge pull request #4299 from AntonKhorev/no-changeset-action-button-css
Remove subscribe/unsubscribe button custom css
Tom Hughes [Wed, 18 Oct 2023 14:53:08 +0000 (15:53 +0100)]
Update annotation for change to changeset_tags indexes
Andy Allan [Wed, 18 Oct 2023 14:41:01 +0000 (15:41 +0100)]
Merge pull request #4279 from tomhughes/changeset-tags-primary-key
Add a primary key to the changeset_tags table
Anton Khorev [Wed, 18 Oct 2023 14:37:36 +0000 (17:37 +0300)]
Remove subscribe/unsubscribe button custom css
Andy Allan [Wed, 18 Oct 2023 13:22:05 +0000 (14:22 +0100)]
Merge pull request #4289 from grekko/github_workflow_add_annotate_models_check_2
.github/workflows/lint.yml: Check if annotate_models is up to date
Tom Hughes [Tue, 17 Oct 2023 17:49:58 +0000 (18:49 +0100)]
Merge remote-tracking branch 'upstream/pull/4295'
Tom Hughes [Tue, 17 Oct 2023 17:47:24 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4294'
Tom Hughes [Tue, 17 Oct 2023 17:36:02 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/4292'
Tom Hughes [Tue, 17 Oct 2023 17:25:38 +0000 (18:25 +0100)]
Update i18n tasks from latest gem
Tom Hughes [Tue, 17 Oct 2023 17:25:32 +0000 (18:25 +0100)]
Update bundle
Anton Khorev [Tue, 17 Oct 2023 14:35:14 +0000 (17:35 +0300)]
Replace secondary nav buttons custom css with classes
Anton Khorev [Tue, 17 Oct 2023 14:21:25 +0000 (17:21 +0300)]
Enable focus outline on More button
Anton Khorev [Tue, 17 Oct 2023 09:26:29 +0000 (12:26 +0300)]
Decrease directions button height to match Go button
translatewiki.net [Mon, 16 Oct 2023 11:21:41 +0000 (13:21 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Mon, 16 Oct 2023 09:23:49 +0000 (12:23 +0300)]
Remove some h1/logo custom css
Gregory Igelmund [Sat, 14 Oct 2023 03:22:40 +0000 (11:22 +0800)]
.github/workflows/lint.yml: Add task verifying annotations are up2date
Gregory Igelmund [Sat, 14 Oct 2023 03:19:13 +0000 (11:19 +0800)]
Annotate models
translatewiki.net [Thu, 12 Oct 2023 11:20:49 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 10 Oct 2023 17:35:20 +0000 (18:35 +0100)]
Update bundle
Tom Hughes [Tue, 10 Oct 2023 17:19:13 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4276'
translatewiki.net [Mon, 9 Oct 2023 11:22:50 +0000 (13:22 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 7 Oct 2023 16:51:28 +0000 (17:51 +0100)]
Add a primary key to the changeset_tags table
Tom Hughes [Sat, 7 Oct 2023 16:50:10 +0000 (17:50 +0100)]
Improve support for primary keys in migrations
Tom Hughes [Sat, 7 Oct 2023 14:08:30 +0000 (15:08 +0100)]
Drop redundant primary key specification for languages table
Tom Hughes [Sat, 7 Oct 2023 10:57:54 +0000 (11:57 +0100)]
Drop workaround to force UTF8 form upload in IE8
This has been disabled by default in rails for some time.
dependabot[bot] [Fri, 6 Oct 2023 23:42:27 +0000 (23:42 +0000)]
Bump eslint from 8.50.0 to 8.51.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.51.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/v8.50.0...v8.51.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Fri, 6 Oct 2023 18:07:19 +0000 (19:07 +0100)]
Fix rails 7.1.0 deprecation warning
translatewiki.net [Thu, 5 Oct 2023 11:20:32 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 4 Oct 2023 18:10:47 +0000 (19:10 +0100)]
Merge remote-tracking branch 'upstream/pull/4274'
Andy Allan [Wed, 4 Oct 2023 17:48:56 +0000 (18:48 +0100)]
Merge pull request #4257 from tordans/docker-compose
Docker: Use `docker compose`
Tobias [Thu, 21 Sep 2023 08:15:54 +0000 (10:15 +0200)]
Docker: Use `docker compose` in Docs and Workflow
Also extend "Tests" section on how to prepare the tests
Andy Allan [Wed, 4 Oct 2023 16:53:58 +0000 (17:53 +0100)]
Prefer find_by() instead of where().first
These are very similar, differing only if we would expect multiple
results and the sorting is important. However, in all our cases
we're only expecting one result to be returned, and so find_by is
easier to read.
Tom Hughes [Tue, 3 Oct 2023 18:39:41 +0000 (19:39 +0100)]
Merge remote-tracking branch 'upstream/pull/4226'
Milan Cvetkovic [Thu, 21 Sep 2023 10:51:30 +0000 (10:51 +0000)]
Load openid signing key from endpoint during openid connect test
Milan Cvetkovic [Fri, 15 Sep 2023 18:03:16 +0000 (18:03 +0000)]
Add test for openid discovery
Milan Cvetkovic [Fri, 15 Sep 2023 12:24:35 +0000 (12:24 +0000)]
Add a test for openid connect support
Milan Cvetkovic [Wed, 30 Aug 2023 12:36:55 +0000 (12:36 +0000)]
Add openid connect support using doorkeeper-openid_connect gem
... as discussed in [Issue 507](https://github.com/openstreetmap/operations/issues/507)
and described by @mmd-osm.
To activate, set the value of `doorkeeper_signing_key` to RSA private key.
Allows using openstreetmap as an identity provider.
Adds `openid` scope to OAuth2 authorizations, required to login to OSM.
Currently, the only claims returned are:
- "openid" scope: "sub" and "preferred_username"
- "read_email" scope: "email"
Milan Cvetkovic [Mon, 4 Sep 2023 14:46:29 +0000 (14:46 +0000)]
Merge locale definitions to config/locales/en.yml
Milan Cvetkovic [Wed, 30 Aug 2023 12:19:00 +0000 (12:19 +0000)]
Add unconfigured doorkeeper-openid_connect
After executing:
rails generate doorkeeper:openid_connect:install
rails generate doorkeeper:openid_connect:install
Split migration script to 2 to avoid deadlock.
Tom Hughes [Tue, 3 Oct 2023 16:01:37 +0000 (17:01 +0100)]
Update bundle
Tom Hughes [Tue, 3 Oct 2023 16:00:13 +0000 (17:00 +0100)]
Merge remote-tracking branch 'upstream/pull/4271'
Anton Khorev [Tue, 3 Oct 2023 00:06:12 +0000 (03:06 +0300)]
Remove <picture>s around <img srcset=...>
Tom Hughes [Mon, 2 Oct 2023 17:53:14 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/4269'
Tom Hughes [Mon, 2 Oct 2023 17:48:52 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/4268'
Tom Hughes [Mon, 2 Oct 2023 17:47:21 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/4266'
Tom Hughes [Mon, 2 Oct 2023 17:45:53 +0000 (18:45 +0100)]
Merge remote-tracking branch 'upstream/pull/4267'
translatewiki.net [Mon, 2 Oct 2023 11:19:00 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Mon, 2 Oct 2023 01:12:47 +0000 (04:12 +0300)]
Remove <picture> from logo
Anton Khorev [Sun, 1 Oct 2023 23:13:18 +0000 (02:13 +0300)]
Remove custom color from changeset comments count
Anton Khorev [Sun, 1 Oct 2023 23:06:38 +0000 (02:06 +0300)]
Remove custom opacity from changeset comments count
Anton Khorev [Sun, 1 Oct 2023 15:40:10 +0000 (18:40 +0300)]
Remove rtl direction fix for <code>
Anton Khorev [Sun, 1 Oct 2023 15:00:18 +0000 (18:00 +0300)]
Limit nav color override to edit/history/export buttons
Anton Khorev [Sat, 16 Sep 2023 15:10:52 +0000 (18:10 +0300)]
Write button instead of link for 'Where is this?'
Anton Khorev [Sat, 16 Sep 2023 14:40:07 +0000 (17:40 +0300)]
Make search input a direct child of input group
Tom Hughes [Fri, 29 Sep 2023 09:05:31 +0000 (10:05 +0100)]
Merge remote-tracking branch 'upstream/pull/4261'
Andy Allan [Wed, 20 Sep 2023 14:59:24 +0000 (15:59 +0100)]
Upgrade to bootstrap 5.2
Tom Hughes [Thu, 28 Sep 2023 20:15:52 +0000 (21:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4264'
Andy Allan [Thu, 28 Sep 2023 20:01:41 +0000 (21:01 +0100)]
Fix border settings used in workaround
Fixes #4263
Tom Hughes [Thu, 28 Sep 2023 15:35:05 +0000 (16:35 +0100)]
Merge remote-tracking branch 'upstream/pull/4260'
translatewiki.net [Thu, 28 Sep 2023 11:19:02 +0000 (13:19 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 27 Sep 2023 16:36:35 +0000 (17:36 +0100)]
Merge pull request #3690 from AntonKhorev/search-form-no-group
Stick search input and Go button together with flex instead of input group
Andy Allan [Wed, 27 Sep 2023 14:47:44 +0000 (15:47 +0100)]
Merge pull request #4201 from AntonKhorev/issues-limit-settings
Move max value of issues counter to settings
Andy Allan [Wed, 27 Sep 2023 14:33:58 +0000 (15:33 +0100)]
Merge pull request #4249 from AntonKhorev/no-traces-nav-empty-li
Change traces feed and upload button alignment
Andy Allan [Wed, 27 Sep 2023 14:10:52 +0000 (15:10 +0100)]
Merge pull request #4184 from AntonKhorev/print
Show sidebar in print media
Andy Allan [Wed, 27 Sep 2023 08:23:26 +0000 (09:23 +0100)]
Workaround for dartsass vs bootstrap 5.1 bug
Andy Allan [Wed, 20 Sep 2023 14:26:58 +0000 (15:26 +0100)]
Switch from sassc-rails to dartsass-sprockets
sassc-rails, and its underlying libsass, is deprecated. dartsass-sprockets
allows us to use the currently maintained dartsass implementation,
without having to change any of our toolchain.
The version of sass-embedded is pinned to avoid warnings in bootstrap. When
we upgrade bootstrap versions, we can upgrade sass-embedded to match.
Andy Allan [Wed, 20 Sep 2023 15:50:44 +0000 (16:50 +0100)]
Install git in Docker to allow git repos in Gemfile
Tom Hughes [Tue, 26 Sep 2023 17:35:05 +0000 (18:35 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 26 Sep 2023 17:21:09 +0000 (18:21 +0100)]
Update bundle
translatewiki.net [Mon, 25 Sep 2023 11:17:56 +0000 (13:17 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 24 Sep 2023 17:34:50 +0000 (18:34 +0100)]
Merge remote-tracking branch 'upstream/pull/4258'
dependabot[bot] [Fri, 22 Sep 2023 23:47:53 +0000 (23:47 +0000)]
Bump eslint from 8.49.0 to 8.50.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.49.0 to 8.50.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/v8.49.0...v8.50.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Fri, 22 Sep 2023 16:54:18 +0000 (17:54 +0100)]
Add whitespace
Tom Hughes [Fri, 22 Sep 2023 16:45:42 +0000 (17:45 +0100)]
Merge remote-tracking branch 'upstream/pull/4255'