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

11546 commits

This branch
This branch
All branches
Author SHA1 Message Date
Harry Wood
1714e2f02d Remove section on removed rake doc:app 
Remove the section of contributing docs about how `rake doc:app` can be used to generate some sort of documentation. That will not work any more, since this task was removed from Rails v5 because people don't generally use it! https://stackoverflow.com/a/36804474/338265
 2022-02-12 18:06:48 +00:00
Harry Wood
6ede9e3ec7 Fix contrib doc to remove reference to travis 
Remove the reference to Travis CI. Our CI pipeline now runs withing github actions.
 2022-02-12 17:53:39 +00:00
Tom Hughes
2fe84cc2a8 Update to rails 6.1.4.6 2022-02-11 22:20:11 +00:00
Tom Hughes
c167ec0f9b Update bundle 2022-02-11 22:19:43 +00:00
translatewiki.net
0d15899de5 Localisation updates from https://translatewiki.net. 2022-02-10 13:11:21 +01:00
Tom Hughes
af273f5d6a Update bundle 2022-02-08 18:22:05 +00:00
translatewiki.net
abdc557bc9 Localisation updates from https://translatewiki.net. 2022-02-07 13:10:37 +01:00
Tom Hughes
446837c351 Merge remote-tracking branch 'upstream/pull/3419' 2022-02-03 18:37:12 +00:00
Tom Hughes
b2993e3a79 Merge remote-tracking branch 'upstream/pull/3446' 2022-02-03 18:32:49 +00:00
Tom Hughes
1cee23ddc2 Merge remote-tracking branch 'upstream/pull/3445' 2022-02-03 18:32:40 +00:00
Martin Raifer
1e78b1e4d2
Update to iD v2.20.4 2022-02-03 16:19:01 +01:00
translatewiki.net
b82b16c2a5 Localisation updates from https://translatewiki.net. 2022-02-03 13:11:37 +01:00
Andy Allan
2d47d6b4f8 Ensure that deactivate isn't available in production 
It's only used as a workaround for factories not being able to create
pending users while keeping active as the default
 2022-02-02 17:48:17 +00:00
Andy Allan
2731e7244a Add extra user transitions needed by the administrators 2022-02-02 16:37:50 +00:00
Morten Bruhn
ec58fbde83
Added some key-value pairs under railway= 2022-02-02 16:13:07 +01:00
Tom Hughes
9a673ae76a Update bundle 2022-02-01 18:59:56 +00:00
Tom Hughes
7d53525219 Index note comments by author and date 
Fixes #3443
 2022-02-01 18:48:18 +00:00
Tom Hughes
5cb7fbb3d1 Merge remote-tracking branch 'upstream/pull/3442' 2022-02-01 18:22:33 +00:00
Tom Hughes
0d1147e781 Merge remote-tracking branch 'upstream/pull/3439' 2022-02-01 18:13:40 +00:00
Martin Raifer
7473925ac2
Update to iD v2.20.3 2022-01-31 18:10:00 +01:00
translatewiki.net
4ea6a3c16d Localisation updates from https://translatewiki.net. 2022-01-31 13:10:21 +01:00
dependabot[bot]
955e7a0f03
Bump eslint from 8.7.0 to 8.8.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.7.0 to 8.8.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.7.0...v8.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-28 23:00:33 +00:00
Tom Hughes
81c58571c5 Fix route for "go public" button on the account edit page 2022-01-28 12:39:39 +00:00
translatewiki.net
a26100c7ec Localisation updates from https://translatewiki.net. 2022-01-27 13:11:14 +01:00
Tom Hughes
e71a398a61 Update bundle 2022-01-25 18:22:46 +00:00
translatewiki.net
36dd599507 Localisation updates from https://translatewiki.net. 2022-01-24 13:12:09 +01:00
translatewiki.net
0afae71af6 Localisation updates from https://translatewiki.net. 2022-01-20 13:11:20 +01:00
Tom Hughes
3a534ea895 Merge remote-tracking branch 'upstream/pull/3426' 2022-01-19 18:19:10 +00:00
Andy Allan
722b9d27be Allow blank issue templates 
This was originally intended in #3397 and I'm not sure why I set this
to false.
 2022-01-19 16:14:03 +00:00
Tom Hughes
c59471842f Merge remote-tracking branch 'upstream/pull/3420' 2022-01-18 19:03:32 +00:00
Tom Hughes
38613c0283 Update bundle 2022-01-18 08:12:14 +00:00
Tom Hughes
c59604b75e Merge remote-tracking branch 'upstream/pull/3425' 2022-01-18 08:10:59 +00:00
dependabot[bot]
0dc14b6e79
Bump eslint from 8.6.0 to 8.7.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.6.0 to 8.7.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.6.0...v8.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-17 23:00:46 +00:00
translatewiki.net
c0291f4025 Localisation updates from https://translatewiki.net. 2022-01-17 13:11:06 +01:00
Tom Hughes
988d7cd90d Remove form_action restrictions for sessions#login 
Login may redirect to ouath2_authorizations#create which may then
redirect to arbitrary schemes if the application is already authorized
so we need to allow login to redirect to any scheme.

Fixes #3424
 2022-01-17 11:01:07 +00:00
Tom Hughes
ff995e7ea3 Restore form_action restrictions for ouath2_authorizations#create 2022-01-17 11:00:41 +00:00
Tom Hughes
707ebddbb5 Remove form_action restrictions for ouath2_authorizations#create 
Fixes #3424
 2022-01-17 09:33:28 +00:00
translatewiki.net
2a82bd1cf1 Localisation updates from https://translatewiki.net. 2022-01-13 13:10:10 +01:00
Nick Doiron
a4f601b114
rm spaces 2022-01-12 19:16:09 -05:00
Nick Doiron
e9522b0205
add dir="auto" to search fields 
Improves right-to-left text input support
 2022-01-12 19:06:18 -05:00
Tom Hughes
16434ef1ba Merge remote-tracking branch 'upstream/pull/3418' 2022-01-12 18:23:53 +00:00
Andy Allan
1a11c4dc19 Use a state machine for user status 
The user status is a bit complex, since there are various states and
not all transitions between them make sense.

Using AASM means that we can name and restrict the transitions, which
hopefully makes them easier to reason about.
 2022-01-12 18:16:14 +00:00
Tom Hughes
13c70d3195 Merge remote-tracking branch 'upstream/pull/3416' 2022-01-12 18:15:46 +00:00
Andy Allan
4436099e31 Remove params from user deletion test 
They have no effect, and are likely a copy-paste error from when
the test was first written in 39a54f8c14
 2022-01-12 16:45:58 +00:00
dependabot[bot]
98d6d7c10d
Bump qs from 6.10.2 to 6.10.3 
Bumps [qs](https://github.com/ljharb/qs) from 6.10.2 to 6.10.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.2...v6.10.3)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-11 23:00:52 +00:00
Tom Hughes
786f28993a Switch github URLs to use https 
Fixes #3415
 2022-01-11 21:16:11 +00:00
Tom Hughes
d6da1499fc Avoid putting ActionController::Parameters objects in the session 2022-01-11 19:43:43 +00:00
Tom Hughes
6be336db00 Update bundle 2022-01-11 19:43:36 +00:00
Tom Hughes
6403515897 Replace to_s on TimeWithZone objects with to_formatted_s 2022-01-10 18:59:22 +00:00
translatewiki.net
b676aa76c5 Localisation updates from https://translatewiki.net. 2022-01-10 13:09:11 +01:00