cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13006 commits 4 branches 1 tag 499 MiB
Commit graph

13006 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gregory Igelmund
a4edd3fd04
Annotate models 2023-10-14 11:19:13 +08:00
Tom Hughes
2b920cd7b4 Update bundle 2023-10-10 18:35:20 +01:00
Tom Hughes
e1128054d9 Merge remote-tracking branch 'upstream/pull/4276' 2023-10-10 18:19:13 +01:00
translatewiki.net
70df26959b Localisation updates from https://translatewiki.net. 2023-10-09 13:22:50 +02:00
Tom Hughes
7dbc349510 Drop redundant primary key specification for languages table 2023-10-07 15:08:30 +01:00
Tom Hughes
8d7b98a618 Drop workaround to force UTF8 form upload in IE8 
This has been disabled by default in rails for some time.
 2023-10-07 11:57:54 +01:00
dependabot[bot]
7b5f590a2d
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>
 2023-10-06 23:42:27 +00:00
Tom Hughes
f6d1b6cda4 Fix rails 7.1.0 deprecation warning 2023-10-06 19:07:47 +01:00
translatewiki.net
fc2c4cc9ab Localisation updates from https://translatewiki.net. 2023-10-05 13:20:32 +02:00
Tom Hughes
682201d8f4 Merge remote-tracking branch 'upstream/pull/4274' 2023-10-04 19:10:47 +01:00
Andy Allan
832bb21cce
Merge pull request #4257 from tordans/docker-compose 
Docker: Use `docker compose`
 2023-10-04 18:48:56 +01:00
Tobias
d42455d491 Docker: Use docker compose in Docs and Workflow 
Also extend "Tests" section on how to prepare the tests
 2023-10-04 19:33:58 +02:00
Andy Allan
1700c23dd1 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.
 2023-10-04 17:53:58 +01:00
Tom Hughes
c8fc2218e5 Merge remote-tracking branch 'upstream/pull/4226' 2023-10-03 19:39:41 +01:00
Milan Cvetkovic
408f2918d0 Load openid signing key from endpoint during openid connect test 2023-10-03 18:55:10 +01:00
Milan Cvetkovic
2d5acd199b Add test for openid discovery 2023-10-03 18:55:10 +01:00
Milan Cvetkovic
1f62a2b342 Add a test for openid connect support 2023-10-03 18:55:10 +01:00
Milan Cvetkovic
64bcf7652b 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"
 2023-10-03 18:53:47 +01:00
Milan Cvetkovic
e996ee5dbc Merge locale definitions to config/locales/en.yml 2023-10-03 18:53:09 +01:00
Milan Cvetkovic
8a22bfb222 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.
 2023-10-03 18:53:09 +01:00
Tom Hughes
370d2b644d Update bundle 2023-10-03 17:01:37 +01:00
Tom Hughes
2de33c2f1d Merge remote-tracking branch 'upstream/pull/4271' 2023-10-03 17:00:13 +01:00
Anton Khorev
0fae5627a5 Remove <picture>s around <img srcset=...> 2023-10-03 03:06:12 +03:00
Tom Hughes
95041ec81a Merge remote-tracking branch 'upstream/pull/4269' 2023-10-02 18:53:14 +01:00
Tom Hughes
389b715241 Merge remote-tracking branch 'upstream/pull/4268' 2023-10-02 18:48:52 +01:00
Tom Hughes
0d420a8374 Merge remote-tracking branch 'upstream/pull/4266' 2023-10-02 18:47:21 +01:00
Tom Hughes
82de8dd973 Merge remote-tracking branch 'upstream/pull/4267' 2023-10-02 18:45:53 +01:00
translatewiki.net
900d475392 Localisation updates from https://translatewiki.net. 2023-10-02 13:19:00 +02:00
Anton Khorev
94fead62ec Remove <picture> from logo 2023-10-02 04:12:47 +03:00
Anton Khorev
3c5c376158 Remove custom color from changeset comments count 2023-10-02 02:32:47 +03:00
Anton Khorev
9768a01717 Remove custom opacity from changeset comments count 2023-10-02 02:32:03 +03:00
Anton Khorev
d60a873126 Remove rtl direction fix for <code> 2023-10-01 18:40:10 +03:00
Anton Khorev
839cc132b8 Limit nav color override to edit/history/export buttons 2023-10-01 18:16:36 +03:00
Anton Khorev
665f6d3d95 Write button instead of link for 'Where is this?' 2023-10-01 18:16:35 +03:00
Anton Khorev
e6e478f5b0 Make search input a direct child of input group 2023-10-01 17:49:31 +03:00
Tom Hughes
77d495ccdc Merge remote-tracking branch 'upstream/pull/4261' 2023-09-29 10:05:31 +01:00
Andy Allan
520cffabea Upgrade to bootstrap 5.2 2023-09-29 09:41:35 +01:00
Tom Hughes
5dbdb5aa14 Merge remote-tracking branch 'upstream/pull/4264' 2023-09-28 21:15:52 +01:00
Andy Allan
ad4ed68037 Fix border settings used in workaround 
Fixes #4263
 2023-09-28 21:01:41 +01:00
Tom Hughes
32ffd66eb5 Merge remote-tracking branch 'upstream/pull/4260' 2023-09-28 16:35:05 +01:00
translatewiki.net
be541bcab2 Localisation updates from https://translatewiki.net. 2023-09-28 13:19:02 +02:00
Andy Allan
14936150ac
Merge pull request #3690 from AntonKhorev/search-form-no-group 
Stick search input and Go button together with flex instead of input group
 2023-09-27 17:36:35 +01:00
Andy Allan
0a046673d6
Merge pull request #4201 from AntonKhorev/issues-limit-settings 
Move max value of issues counter to settings
 2023-09-27 15:47:44 +01:00
Andy Allan
a569343e01
Merge pull request #4249 from AntonKhorev/no-traces-nav-empty-li 
Change traces feed and upload button alignment
 2023-09-27 15:33:58 +01:00
Andy Allan
228ab23ce1
Merge pull request #4184 from AntonKhorev/print 
Show sidebar in print media
 2023-09-27 15:10:52 +01:00
Andy Allan
c975bae507 Workaround for dartsass vs bootstrap 5.1 bug 2023-09-27 09:35:30 +01:00
Andy Allan
41f13ac73a 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.
 2023-09-27 09:35:30 +01:00
Andy Allan
6b6c468915 Install git in Docker to allow git repos in Gemfile 2023-09-27 09:34:06 +01:00
Tom Hughes
e8af4b85bf Fix new rubocop warnings 2023-09-26 18:42:57 +01:00
Tom Hughes
a18366903e Update bundle 2023-09-26 18:21:09 +01:00