rails.git
19 months agoMerge remote-tracking branch 'upstream/pull/2596'
Tom Hughes [Wed, 22 Apr 2020 12:44:17 +0000 (13:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2596'

19 months agoMerge remote-tracking branch 'upstream/pull/2597'
Tom Hughes [Wed, 22 Apr 2020 12:34:19 +0000 (13:34 +0100)]
Merge remote-tracking branch 'upstream/pull/2597'

19 months agoUse Open3.capture2 instead of backticks, to avoid command line injection risks
Andy Allan [Wed, 22 Apr 2020 11:22:30 +0000 (13:22 +0200)]
Use Open3.capture2 instead of backticks, to avoid command line injection risks

In this situation, trace_name can be trivially checked as legitimate, but this
removes any lingering risks from interpolating into a command line instead of
passing parameters explicitly.

Refs #2229

19 months agoRedirect to the error page for non-existent issues
Tom Hughes [Wed, 22 Apr 2020 11:22:34 +0000 (12:22 +0100)]
Redirect to the error page for non-existent issues

19 months agoSend meta information with error pages
Tom Hughes [Wed, 22 Apr 2020 11:21:42 +0000 (12:21 +0100)]
Send meta information with error pages

19 months agoRefactor site controller tests to inherit from ActionDispatch::IntegrationTest
Andy Allan [Wed, 22 Apr 2020 09:02:41 +0000 (11:02 +0200)]
Refactor site controller tests to inherit from ActionDispatch::IntegrationTest

This is the modern way of writing controller tests, since it uses the
rails middleware (among other things) and leads to more realistic tests.

Refs #2563

19 months agoRemove last traces of konacha
Tom Hughes [Mon, 20 Apr 2020 18:14:25 +0000 (19:14 +0100)]
Remove last traces of konacha

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 Apr 2020 15:01:46 +0000 (17:01 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoFix new rubocop warnings
Tom Hughes [Sun, 19 Apr 2020 18:06:07 +0000 (19:06 +0100)]
Fix new rubocop warnings

19 months agoEnable new cops by default
Tom Hughes [Sun, 19 Apr 2020 18:04:32 +0000 (19:04 +0100)]
Enable new cops by default

19 months agoUpdate bundle
Tom Hughes [Sun, 19 Apr 2020 17:59:28 +0000 (18:59 +0100)]
Update bundle

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Apr 2020 15:14:59 +0000 (17:14 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoCache OpenID provider names on a per-locale basis
Tom Hughes [Wed, 15 Apr 2020 21:48:28 +0000 (22:48 +0100)]
Cache OpenID provider names on a per-locale basis

Fixes #2591

19 months agoLocalise formatting of point count for traces
Tom Hughes [Wed, 15 Apr 2020 21:42:41 +0000 (22:42 +0100)]
Localise formatting of point count for traces

Fixes #2592

19 months agoUpdate bundle
Tom Hughes [Wed, 15 Apr 2020 18:23:16 +0000 (19:23 +0100)]
Update bundle

19 months agoMerge remote-tracking branch 'upstream/pull/2431'
Tom Hughes [Wed, 15 Apr 2020 18:18:10 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/2431'

19 months agoFix rubocop-minitest warnings
Tom Hughes [Wed, 15 Apr 2020 18:06:03 +0000 (19:06 +0100)]
Fix rubocop-minitest warnings

19 months agoSort cops
Tom Hughes [Wed, 15 Apr 2020 14:51:55 +0000 (15:51 +0100)]
Sort cops

19 months agoFix erblint
Tom Hughes [Wed, 15 Apr 2020 14:51:43 +0000 (15:51 +0100)]
Fix erblint

19 months agoMerge pull request #2547 from bezdna/mobile-layout
Andy Allan [Wed, 15 Apr 2020 14:50:12 +0000 (16:50 +0200)]
Merge pull request #2547 from bezdna/mobile-layout

Trigger small screen layout based on the width of the screen, rather than the width of the menus.

19 months agoMerge remote-tracking branch 'upstream/pull/2579'
Tom Hughes [Wed, 15 Apr 2020 14:41:49 +0000 (15:41 +0100)]
Merge remote-tracking branch 'upstream/pull/2579'

19 months agoMerge remote-tracking branch 'upstream/pull/2590'
Tom Hughes [Wed, 15 Apr 2020 14:35:37 +0000 (15:35 +0100)]
Merge remote-tracking branch 'upstream/pull/2590'

19 months agoAdd rubocop-minitest
Andy Allan [Wed, 15 Apr 2020 14:15:52 +0000 (16:15 +0200)]
Add rubocop-minitest

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 14 Apr 2020 03:34:16 +0000 (05:34 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoAdd tile.openstreetmap.org to security policy
Tom Hughes [Mon, 13 Apr 2020 23:03:55 +0000 (00:03 +0100)]
Add tile.openstreetmap.org to security policy

19 months agoUpdate leaflet.osm plugin
Tom Hughes [Mon, 13 Apr 2020 23:01:30 +0000 (00:01 +0100)]
Update leaflet.osm plugin

19 months agoUpdate leaflet.osm plugin
Tom Hughes [Fri, 10 Apr 2020 13:31:31 +0000 (14:31 +0100)]
Update leaflet.osm plugin

19 months agoRemove unsued bootstrap components from Vendorfile
Tom Hughes [Fri, 10 Apr 2020 13:30:54 +0000 (14:30 +0100)]
Remove unsued bootstrap components from Vendorfile

19 months agoRemove arabic strings from en-GB locale
Tom Hughes [Thu, 9 Apr 2020 20:21:09 +0000 (21:21 +0100)]
Remove arabic strings from en-GB locale

19 months agoAdd blob to frame-src in CSP for iD
Tom Hughes [Thu, 9 Apr 2020 17:42:17 +0000 (18:42 +0100)]
Add blob to frame-src in CSP for iD

Fixes #2582
Closes #2583

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Apr 2020 14:10:03 +0000 (16:10 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoUpdate bundle
Tom Hughes [Wed, 8 Apr 2020 08:48:42 +0000 (09:48 +0100)]
Update bundle

20 months agoEnsure that urls are only valid if the entire string is a url
Andy Allan [Wed, 1 Apr 2020 15:53:37 +0000 (17:53 +0200)]
Ensure that urls are only valid if the entire string is a url

This replaces our homegrown regexps (that didn't quite work) with
ruby built-in regexps, and uses the termination anchor to ensure
that the entire string, not just the first part, is validated.

20 months agoMerge remote-tracking branch 'upstream/pull/2577'
Tom Hughes [Wed, 1 Apr 2020 10:56:27 +0000 (11:56 +0100)]
Merge remote-tracking branch 'upstream/pull/2577'

20 months agoRemove custom table styling
Andy Allan [Wed, 1 Apr 2020 10:06:36 +0000 (12:06 +0200)]
Remove custom table styling

This removes the custom table styling code, and move to using bootstrap table styling for almost all remaining tables.

20 months agoUpdate leaflet plugins
Tom Hughes [Wed, 1 Apr 2020 08:24:44 +0000 (09:24 +0100)]
Update leaflet plugins

20 months agoMerge remote-tracking branch 'upstream/pull/2574'
Tom Hughes [Wed, 1 Apr 2020 08:18:24 +0000 (09:18 +0100)]
Merge remote-tracking branch 'upstream/pull/2574'

20 months agoFix typo in comment
Simon Legner [Tue, 31 Mar 2020 23:04:58 +0000 (01:04 +0200)]
Fix typo in comment

Closes #2576

20 months agoUpdate leaflet to 1.6.0
Simon Legner [Tue, 31 Mar 2020 22:28:25 +0000 (00:28 +0200)]
Update leaflet to 1.6.0

20 months agoFix new rubocop warnings
Tom Hughes [Tue, 31 Mar 2020 18:08:10 +0000 (19:08 +0100)]
Fix new rubocop warnings

20 months agoUpdate bundle
Tom Hughes [Tue, 31 Mar 2020 18:05:37 +0000 (19:05 +0100)]
Update bundle

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 31 Mar 2020 13:59:29 +0000 (15:59 +0200)]
Localisation updates from https://translatewiki.net.

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Mar 2020 15:12:44 +0000 (16:12 +0100)]
Localisation updates from https://translatewiki.net.

20 months agoSet QT_QPA_PLATFORM=offscreen for Ubuntu etc
Tom Hughes [Wed, 25 Mar 2020 17:03:52 +0000 (17:03 +0000)]
Set QT_QPA_PLATFORM=offscreen for Ubuntu etc

Fixes #2569

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Mar 2020 14:07:13 +0000 (15:07 +0100)]
Localisation updates from https://translatewiki.net.

20 months agoMake linkify return an HTML safe result for unsafe inputs
Tom Hughes [Sun, 22 Mar 2020 12:47:56 +0000 (12:47 +0000)]
Make linkify return an HTML safe result for unsafe inputs

Fixes #2567

20 months agoFix some untranslateable strings
Tom Hughes [Fri, 20 Mar 2020 17:22:23 +0000 (17:22 +0000)]
Fix some untranslateable strings

Fixes #2565

20 months agoPass I18n argument correctly
Tom Hughes [Fri, 20 Mar 2020 14:58:45 +0000 (14:58 +0000)]
Pass I18n argument correctly

20 months agoFix lego translation with locate control
Tom Hughes [Fri, 20 Mar 2020 14:28:51 +0000 (14:28 +0000)]
Fix lego translation with locate control

Fixes #2564

20 months agoUpdate javascript bundle
Tom Hughes [Thu, 19 Mar 2020 18:26:04 +0000 (18:26 +0000)]
Update javascript bundle

20 months agoUpdate to rails 6.0.2.2
Tom Hughes [Thu, 19 Mar 2020 18:20:26 +0000 (18:20 +0000)]
Update to rails 6.0.2.2

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Mar 2020 14:12:49 +0000 (15:12 +0100)]
Localisation updates from https://translatewiki.net.

20 months agoMerge remote-tracking branch 'upstream/pull/2548'
Tom Hughes [Wed, 18 Mar 2020 20:15:06 +0000 (20:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2548'

20 months agoMerge remote-tracking branch 'upstream/pull/2448'
Tom Hughes [Wed, 18 Mar 2020 14:58:06 +0000 (14:58 +0000)]
Merge remote-tracking branch 'upstream/pull/2448'

20 months agoMerge remote-tracking branch 'upstream/pull/2562'
Tom Hughes [Wed, 18 Mar 2020 14:51:15 +0000 (14:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2562'

20 months agoCopy trace fixture files, rather than symlinking
Andy Allan [Wed, 18 Mar 2020 14:35:55 +0000 (15:35 +0100)]
Copy trace fixture files, rather than symlinking

Since we are using tmpdirs in order to enable parallel testing, we
can go the full hog and drop the fakefs too and just copy all the
files directly into the tmpdir. If a test makes changes (e.g.
changing the icon file during an import) the copy in the tmpdir is
thrown away at the end of the test anyway.

20 months agoRemove unused directories
Andy Allan [Wed, 4 Dec 2019 11:45:16 +0000 (12:45 +0100)]
Remove unused directories

20 months agoEnable parallel tests
Andy Allan [Wed, 27 Nov 2019 13:58:36 +0000 (14:58 +0100)]
Enable parallel tests

20 months agoUse unique test directories for each trace test
Andy Allan [Wed, 27 Nov 2019 13:57:49 +0000 (14:57 +0100)]
Use unique test directories for each trace test

This allows tests to be run in parallel, since it avoids deleting
some of the symlinks that other tests expect to be there.

20 months agoUse the settings for the destination of the gpx fixture symlinks
Andy Allan [Wed, 27 Nov 2019 13:01:40 +0000 (14:01 +0100)]
Use the settings for the destination of the gpx fixture symlinks

This lets us change the settings values and have the fixtures appear
in the right place.

20 months agoRemove unnecessary h() calls on model attributes
Andy Allan [Wed, 18 Mar 2020 13:33:30 +0000 (14:33 +0100)]
Remove unnecessary h() calls on model attributes

These were necessary in the rails 2.x era, but not now.

20 months agoMerge remote-tracking branch 'upstream/pull/2561'
Tom Hughes [Wed, 18 Mar 2020 11:15:01 +0000 (11:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2561'

20 months agoUse bootstrap table striping to replace hand-cycled table stripes
Andy Allan [Wed, 18 Mar 2020 10:27:36 +0000 (11:27 +0100)]
Use bootstrap table striping to replace hand-cycled table stripes

This cuts down on the complexity of having to use the `cycle` function
and makes the templates easier to read. CSS-based striping has been
around for many years.

The CSS is in order to keep our custom colour for striped tables.

20 months agoMerge remote-tracking branch 'upstream/pull/2560'
Tom Hughes [Wed, 18 Mar 2020 11:02:07 +0000 (11:02 +0000)]
Merge remote-tracking branch 'upstream/pull/2560'

20 months agoEnable remaining bootstrap components
Andy Allan [Wed, 18 Mar 2020 10:16:03 +0000 (11:16 +0100)]
Enable remaining bootstrap components

Fixes #2511

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Mar 2020 14:52:51 +0000 (15:52 +0100)]
Localisation updates from https://translatewiki.net.

20 months agoMerge remote-tracking branch 'upstream/pull/2558'
Tom Hughes [Sat, 14 Mar 2020 15:51:23 +0000 (15:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2558'

20 months agoMoved CSS rule
hikemaniac [Sat, 14 Mar 2020 15:39:21 +0000 (16:39 +0100)]
Moved CSS rule

20 months agoFix border-radius for search query input field
hikemaniac [Sat, 14 Mar 2020 15:06:33 +0000 (16:06 +0100)]
Fix border-radius for search query input field

20 months agoUpdate javascript bundle
Tom Hughes [Sat, 14 Mar 2020 00:39:29 +0000 (00:39 +0000)]
Update javascript bundle

Closes #2557

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Mar 2020 18:27:55 +0000 (19:27 +0100)]
Localisation updates from https://translatewiki.net.

20 months agoUpdate bundle
Tom Hughes [Wed, 11 Mar 2020 18:52:39 +0000 (18:52 +0000)]
Update bundle

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Mar 2020 15:43:08 +0000 (16:43 +0100)]
Localisation updates from https://translatewiki.net.

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Mar 2020 16:37:12 +0000 (17:37 +0100)]
Localisation updates from https://translatewiki.net.

20 months agoUpdate bundle
Tom Hughes [Wed, 4 Mar 2020 18:46:11 +0000 (18:46 +0000)]
Update bundle

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Mar 2020 13:51:22 +0000 (14:51 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoEnforce restrictions on issue visibility properly
Tom Hughes [Sun, 1 Mar 2020 19:08:40 +0000 (19:08 +0000)]
Enforce restrictions on issue visibility properly

21 months agoFix eslint warnings
Tom Hughes [Sat, 29 Feb 2020 17:52:55 +0000 (17:52 +0000)]
Fix eslint warnings

21 months agoFix highlight of changesets with no bounding box
Tom Hughes [Sat, 29 Feb 2020 17:43:19 +0000 (17:43 +0000)]
Fix highlight of changesets with no bounding box

A changeset with no bounding box has no map layer so trying to
set it's style throws an exception which means we don't get to
the code to set the style on the list entry.

Fixes #2541

21 months agoRework set_default_request_format ast set_request_formats
Tom Hughes [Sat, 29 Feb 2020 15:15:02 +0000 (15:15 +0000)]
Rework set_default_request_format ast set_request_formats

Instead of trying to work out the exact format, just figure
out the list of allowed formats and let rails do the rest.

21 months agoUpdate rubocop configuration
Tom Hughes [Fri, 28 Feb 2020 22:50:08 +0000 (22:50 +0000)]
Update rubocop configuration

21 months agoUpdate bundle
Tom Hughes [Fri, 28 Feb 2020 22:26:51 +0000 (22:26 +0000)]
Update bundle

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Feb 2020 16:19:42 +0000 (17:19 +0100)]
Localisation updates from https://translatewiki.net.

21 months agocss layout change only in content block
Anton Melnichuk [Thu, 27 Feb 2020 08:29:37 +0000 (10:29 +0200)]
css layout change only in content block

21 months agoMerge branch 'master' of github.com:openstreetmap/openstreetmap-website into mobile...
Anton Melnichuk [Thu, 27 Feb 2020 08:15:37 +0000 (10:15 +0200)]
Merge branch 'master' of github.com:openstreetmap/openstreetmap-website into mobile-layout

21 months agorename internal variable
Holger Jeromin [Wed, 26 Feb 2020 19:27:52 +0000 (20:27 +0100)]
rename internal variable

21 months agoMerge pull request #2542 from boubascript/master
Andy Allan [Wed, 26 Feb 2020 16:09:27 +0000 (17:09 +0100)]
Merge pull request #2542 from boubascript/master

Show mailto: links for email values in browse

21 months agoMerge pull request #2485 from mmd-osm/patch/json2
Andy Allan [Wed, 26 Feb 2020 14:55:48 +0000 (15:55 +0100)]
Merge pull request #2485 from mmd-osm/patch/json2

JSON output nodes, ways, relations, map

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Feb 2020 14:45:28 +0000 (15:45 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoAllow bundle path to be overridden when building database functions
Tom Hughes [Sun, 23 Feb 2020 20:30:29 +0000 (20:30 +0000)]
Allow bundle path to be overridden when building database functions

21 months agothe layout is triggered not by JS, but by media queries, now some map bugs have gone...
Anton Melnichuk [Fri, 21 Feb 2020 08:08:38 +0000 (10:08 +0200)]
the layout is triggered not by JS, but by media queries, now some map bugs have gone away themselves
fix #2349 #2035 #1864
@tomhughes: 'Duplicate of many, many other tickets.'

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Feb 2020 15:10:10 +0000 (16:10 +0100)]
Localisation updates from https://translatewiki.net.

21 months agochange validation to accept only single email values
Boubacar [Thu, 20 Feb 2020 04:44:40 +0000 (23:44 -0500)]
change validation to accept only single email values

21 months agoMerge branch 'master' of github.com:openstreetmap/openstreetmap-website
Boubacar [Thu, 20 Feb 2020 01:52:35 +0000 (20:52 -0500)]
Merge branch 'master' of github.com:openstreetmap/openstreetmap-website

21 months agoMerge remote-tracking branch 'upstream/pull/2381'
Tom Hughes [Wed, 19 Feb 2020 19:11:32 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2381'

21 months agoKeep the behaviour backwards-compatible
ENT8R [Wed, 19 Feb 2020 11:58:47 +0000 (12:58 +0100)]
Keep the behaviour backwards-compatible

21 months agochange Max for rubocop Metrics/ModuleLength
Boubacar [Mon, 17 Feb 2020 17:33:47 +0000 (12:33 -0500)]
change Max for rubocop Metrics/ModuleLength

21 months agomake email regex slightly more readable
Boubacar [Mon, 17 Feb 2020 16:39:30 +0000 (11:39 -0500)]
make email regex slightly more readable

21 months agoMerge branch 'master' of github.com:openstreetmap/openstreetmap-website
Boubacar [Mon, 17 Feb 2020 16:28:25 +0000 (11:28 -0500)]
Merge branch 'master' of github.com:openstreetmap/openstreetmap-website

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Feb 2020 14:01:18 +0000 (15:01 +0100)]
Localisation updates from https://translatewiki.net.