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

1858 commits

Author SHA1 Message Date
Andy Allan
819e5ecf94 Add system tests for communities page 2022-04-27 17:14:31 +01:00
Tom Hughes
9c0582f88f Merge remote-tracking branch 'upstream/pull/3523' 2022-04-12 17:12:16 +01:00
Andy Allan
387668a4c6
Merge pull request #3495 from mmd-osm/patch/json_cs 
JSON output added to changeset(s) endpoints
 2022-04-06 18:04:17 +01:00
Andy Allan
561ee71129 Rubocop autofix: ambiguous operator precedence 
This simply adds braces to clarify which mathematical operator comes
first.
 2022-04-06 14:55:29 +01:00
Andy Allan
5c2cb9e96f Use factories for tag uniqueness tests 2022-03-30 17:15:11 +01:00
Andy Allan
034db6820f Simplify changeset tag tests by using factories 
This saves lots of boilerplate in creating a valid test object
 2022-03-30 17:03:04 +01:00
Andy Allan
374518f58a Rework 'empty' tag tests 
These tests were checking that the parent object was set, but this
was not obvious from the way that the tests were named and constructed.

This refactoring makes it clearer what is being checked.
 2022-03-30 16:37:16 +01:00
Tom Hughes
03cad948e3 Fix new rubocop warnings 2022-03-15 19:24:09 +00:00
mmd-osm
4ec85171fd JSON output added to changeset(s) endpoints 2022-03-14 15:52:49 +01:00
Andy Allan
d6f8302eae
Merge pull request #3491 from tomhughes/legacy-trace 
Remove support for legacy trace files
 2022-03-09 17:10:40 +00:00
Andy Allan
13aead5601
Merge pull request #3492 from harry-wood/oauth-doc 
OAuth updates to CONFIGURE doc + cosmetic tweak
 2022-03-09 17:04:37 +00:00
Tom Hughes
44ac569d28 Merge remote-tracking branch 'upstream/pull/3493' 2022-03-08 20:30:19 +00:00
mmd-osm
c9e836a6cb JSON output added to permissions endpoint 2022-03-08 20:21:35 +01:00
Tom Hughes
5d67fa3908 Fix some Naming/AccessorMethodName rubocop warnings 2022-03-08 19:10:05 +00:00
Harry Wood
02338a80e1 Make oauth register app link into button 
Cosmetic tweak. On the OAuth 1 setting tab, make "Register your app" into a button not a link

Also put the applications in a <ul>
 2022-03-08 15:18:53 +00:00
Harry Wood
2ce44a2a85 Fix minor HTML tag mismatches 
Fix some HTML tag mismatches and other glitches. These are minor, and don't appear to cause browsers any problems, but for the sake of correctness:
* A closing td which should be a closing div.
* A closing h3 for a corresponding h6
* Two tables with `<thead>` tag and missing `<tr>` around the `<th>` headings.

test change for thead fix
 2022-03-05 02:44:59 +00:00
Tom Hughes
cbcc7dc49f Fix some rubocop Naming/PredicateName warnings 2022-03-03 22:47:55 +00:00
Tom Hughes
92b122759f Remove support for legacy trace files 2022-03-03 19:47:40 +00:00
Tom Hughes
b5f06e06c1 Fix rubocop Rails/TimeZone warnings 2022-03-01 22:55:10 +00:00
Tom Hughes
1f8df781be Merge remote-tracking branch 'upstream/pull/3398' 2022-02-16 18:13:16 +00:00
Andy Allan
2fabc46421
Merge pull request #3440 from mmd-osm/relationmemberlimit 
Introduce relation member limit
 2022-02-16 14:58:30 +00:00
Tom Hughes
53aa7259bb Merge remote-tracking branch 'upstream/pull/3345' 2022-02-13 18:39:21 +00:00
Andy Allan
6c1d73a509 Allow users to delete their own accounts 
This PR allows users to delete their own accounts. The logic implemented matches
that currently used by the admins when they manually close accounts, although
there is room to be more complex in future e.g. completely removing accounts
with no content.

The error handling has been slightly adapted for namespaced controllers, by
anchoring the controller name with a leading forward slash.
 2022-02-09 16:15:24 +00:00
Tom Hughes
446837c351 Merge remote-tracking branch 'upstream/pull/3419' 2022-02-03 18:37:12 +00:00
Andy Allan
2731e7244a Add extra user transitions needed by the administrators 2022-02-02 16:37:50 +00:00
mmd-osm
2efd73c672 Introduce relation member limit 
Adds a new parameter `max_number_of_relation_members` in settings.yml
 2022-02-02 13:15:40 +01:00
Tom Hughes
81c58571c5 Fix route for "go public" button on the account edit page 2022-01-28 12:39:39 +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
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
Tom Hughes
6403515897 Replace to_s on TimeWithZone objects with to_formatted_s 2022-01-10 18:59:22 +00:00
Tom Hughes
24d605f567 Merge remote-tracking branch 'upstream/pull/3411' 2022-01-06 15:34:30 +00:00
Andy Allan
2f6a87e443 Use assert_link instead of assert page.has_link? 
This leads to better error messages if the test fails
 2022-01-06 15:04:03 +00:00
Tom Hughes
2927c6b6be Merge remote-tracking branch 'upstream/pull/3410' 2022-01-06 13:25:42 +00:00
Andy Allan
d257c21740 Use assert_content instead of assert page.has_content? 
The assert_content comes from capybara, and gives a much more helpful
error message if the test fails.
 2022-01-06 13:16:47 +00:00
Andy Allan
0100cfe304 Use factory_bot to build new model objects 2022-01-06 10:46:38 +00:00
Andy Allan
88cf03ff00 Use factorybot to build user objects 
This allows us to only specify attributes of interest in the test.
 2022-01-05 20:29:12 +00:00
Andy Allan
4bed9c12a0 Fix display of suspension message when a user is suspended mid-session 
Without the ability defined, the user is still logged out, but then
the deny_access check redirects to the login page. The re-login attempt
would then fail anyway, with an error message, but let's fix the abilities
and use the intended page.
 2022-01-05 18:21:42 +00:00
Tom Hughes
4549de5f32 Test redirect from settings page to OmniAuth 2021-12-29 18:29:38 +00:00
Andy Allan
a863be8831 Rename User#delete to User#destroy 
"delete" is generally used for immediate SQL deletion without running
any callbacks or other ruby code, whereas "destroy" will trigger callbacks.

Although we don't currently use any callbacks, let's rename this method to
align better with the convention.
 2021-12-22 11:32:33 +00:00
Tom Hughes
0410596908 Switch traces to use ActiveStorage 2021-12-16 18:45:31 +00:00
Andy Allan
a8e8ba1a64 Refactor the account edit/update pages out into a separate accounts controller 2021-12-08 15:17:50 +00:00
Andy Allan
cb68450ac7 Simplify margins when showing diary entries 2021-11-24 12:24:16 +00:00
Andy Allan
52cd62bf13 Replace CSS-driven borders with bootstrap borders 
This makes future refactoring easier, since the elements will
retain their borders even if the hierarchy changes.

Also round some maps and the legale section since I think those now
look nicer.
 2021-11-24 12:24:16 +00:00
Tom Hughes
abbd5a30d4 Validate any origin passed the auth failure callback 
Fixes #3375
 2021-11-23 17:33:19 +00:00
Tom Hughes
e342314d8b Merge remote-tracking branch 'upstream/pull/3353' 2021-11-16 08:21:17 +00:00
Tom Hughes
e21b9b2bf1 Merge remote-tracking branch 'upstream/pull/3365' 2021-11-11 15:33:08 +00:00
Andy Allan
75749cc540 Convert remaining heading titles to use h1 
This makes them consistent with all the other pages that use h1
in the `content_for :heading` sections
 2021-11-11 15:12:23 +00:00
Andy Allan
3719e8defb Remove the userinformation ids from headings 
The style rule was removed in 3f8cf32272
and they were otherwise only used in the tests.
 2021-11-11 14:53:36 +00:00
Tom Hughes
aad81eb74c Switch to Argon2 for password hashing 2021-11-03 20:39:31 +00:00
Andy Allan
826a864e6c Remove the contact-activity class 
The margin-top is better replaced with a bottom margin on the
preceding element, and the width is unnecessary in the grid layout.
 2021-11-03 18:35:42 +00:00