]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 4 Jun 2020 16:23:16 +0000 (17:23 +0100)]
Improve locale selection algorithm
Don't include locales which only have rails translations in
the candidates, and ensure that user specified options take
priority over less specific variants of earlier choices.
translatewiki.net [Thu, 4 Jun 2020 15:59:12 +0000 (17:59 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 3 Jun 2020 16:47:35 +0000 (17:47 +0100)]
Fix new rubocop warnings
Tom Hughes [Wed, 3 Jun 2020 16:41:38 +0000 (17:41 +0100)]
Update bundle
Tom Hughes [Wed, 3 Jun 2020 16:31:12 +0000 (17:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2641'
Tom Hughes [Wed, 3 Jun 2020 16:19:03 +0000 (17:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2639'
Tom Hughes [Wed, 3 Jun 2020 16:13:49 +0000 (17:13 +0100)]
Merge remote-tracking branch 'upstream/pull/2638'
Tom Hughes [Wed, 3 Jun 2020 16:09:07 +0000 (17:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2637'
Tom Hughes [Wed, 3 Jun 2020 16:07:31 +0000 (17:07 +0100)]
Merge remote-tracking branch 'upstream/pull/2640'
Andy Allan [Wed, 3 Jun 2020 14:44:26 +0000 (16:44 +0200)]
Convert lib files to model concerns
Andy Allan [Wed, 3 Jun 2020 14:14:58 +0000 (16:14 +0200)]
Remove some unused scripts
Andy Allan [Wed, 3 Jun 2020 12:11:04 +0000 (14:11 +0200)]
Merge pull request #2624 from francois2metz/diary-entry
Add link to my diary in the diary index
Andy Allan [Wed, 3 Jun 2020 11:43:56 +0000 (13:43 +0200)]
Use rails 6.0 framework defaults
Keep the old autoloader and utf-8 forms as they were, for now.
Andy Allan [Wed, 3 Jun 2020 09:47:33 +0000 (11:47 +0200)]
Remove the framework defaults initializer for 5.2
We're already using these defaults, as per
6a25ee9ec962bc10997a4c62a6246873130d41a1
so we don't need to keep this file
Andy Allan [Wed, 3 Jun 2020 09:07:26 +0000 (11:07 +0200)]
Remove ineffective query cache disable initializer
This doesn't have any effect, since there is no middleware by that name.
translatewiki.net [Mon, 1 Jun 2020 20:38:37 +0000 (22:38 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 27 May 2020 18:11:58 +0000 (19:11 +0100)]
Update bundle
translatewiki.net [Tue, 26 May 2020 15:14:43 +0000 (17:14 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 21 May 2020 17:50:23 +0000 (18:50 +0100)]
Update bundle
Tom Hughes [Mon, 18 May 2020 17:10:28 +0000 (18:10 +0100)]
Update to rails 6.0.3.1
translatewiki.net [Mon, 18 May 2020 14:12:18 +0000 (16:12 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 13 May 2020 21:42:33 +0000 (22:42 +0100)]
Merge remote-tracking branch 'upstream/pull/2626'
Andy Allan [Wed, 13 May 2020 16:15:07 +0000 (18:15 +0200)]
Remove unused test helper
Andy Allan [Wed, 13 May 2020 16:08:22 +0000 (18:08 +0200)]
Refactor user controller tests
Because we don't have direct access to the session and cookies, some
of the tests need more setup e.g. by moving through the signup process
to get the session tokens into the right place for the confirmation
steps to work.
Andy Allan [Wed, 13 May 2020 16:08:07 +0000 (18:08 +0200)]
Refactor api traces_controller tests
Tom Hughes [Wed, 13 May 2020 10:29:49 +0000 (11:29 +0100)]
Don't try and resize images that aren't resizable
Tom Hughes [Wed, 13 May 2020 10:29:02 +0000 (11:29 +0100)]
Attach resized images to notification emails
Fixes #2625
Tom Hughes [Tue, 12 May 2020 18:18:45 +0000 (19:18 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 12 May 2020 18:17:03 +0000 (19:17 +0100)]
Update bundle
François de Metz [Tue, 12 May 2020 09:37:43 +0000 (11:37 +0200)]
Add link to my diary in the diary index.
François de Metz [Tue, 12 May 2020 09:27:08 +0000 (11:27 +0200)]
Refactor the link to create a new entry diary.
translatewiki.net [Mon, 11 May 2020 15:43:21 +0000 (17:43 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 7 May 2020 18:34:48 +0000 (19:34 +0100)]
Refactor users_controller_test and user_preferences_controller_test
Quincy Morgan [Thu, 7 May 2020 16:11:45 +0000 (09:11 -0700)]
Fix issue with iD embedded document sometimes showing scrollbars
translatewiki.net [Thu, 7 May 2020 15:15:43 +0000 (17:15 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 6 May 2020 19:36:23 +0000 (20:36 +0100)]
Update to rails 6.0.3
Tom Hughes [Wed, 6 May 2020 17:39:48 +0000 (18:39 +0100)]
Refactor notes_controller_test
Tom Hughes [Wed, 6 May 2020 17:06:45 +0000 (18:06 +0100)]
Add test for browsing a note closed by a deleted user
Tom Hughes [Wed, 6 May 2020 15:16:38 +0000 (16:16 +0100)]
Merge remote-tracking branch 'upstream/pull/2613'
Andy Allan [Wed, 6 May 2020 14:51:04 +0000 (16:51 +0200)]
More controller test refactoring
Tom Hughes [Wed, 6 May 2020 13:06:04 +0000 (14:06 +0100)]
Look at all note comments to find the close event
Fixes #2612
Tom Hughes [Tue, 5 May 2020 18:40:52 +0000 (19:40 +0100)]
Refactor permissions_controller_test
Tom Hughes [Tue, 5 May 2020 18:36:38 +0000 (19:36 +0100)]
Refactor versions_controller_test
Tom Hughes [Tue, 5 May 2020 18:28:42 +0000 (19:28 +0100)]
Refactor tracepoints_controller_test
Tom Hughes [Tue, 5 May 2020 18:20:21 +0000 (19:20 +0100)]
Remove unused function
Tom Hughes [Tue, 5 May 2020 18:19:43 +0000 (19:19 +0100)]
Refactor map_controller_test
Tom Hughes [Tue, 5 May 2020 17:03:49 +0000 (18:03 +0100)]
Switch oauth integration tests to use new shared helper
Tom Hughes [Tue, 5 May 2020 16:45:05 +0000 (17:45 +0100)]
Refactor changeset comments API controller tests
Tom Hughes [Tue, 5 May 2020 16:44:33 +0000 (17:44 +0100)]
Add helper methods for making OAuth signed requests
Tom Hughes [Tue, 5 May 2020 16:44:12 +0000 (17:44 +0100)]
Refactor the AMF controller API tests
translatewiki.net [Mon, 4 May 2020 14:14:24 +0000 (16:14 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 May 2020 13:59:34 +0000 (15:59 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 30 Apr 2020 17:49:58 +0000 (18:49 +0100)]
Update bundle
translatewiki.net [Thu, 30 Apr 2020 14:58:29 +0000 (16:58 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 29 Apr 2020 18:11:52 +0000 (19:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2605'
Andy Allan [Wed, 29 Apr 2020 15:41:56 +0000 (17:41 +0200)]
Refactor changesets_controller_test
Introduces some route names which need to be unique from the non-api versions
Andy Allan [Wed, 29 Apr 2020 15:28:42 +0000 (17:28 +0200)]
Refactor more controller tests
Tom Hughes [Tue, 28 Apr 2020 18:44:43 +0000 (19:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2601'
Tom Hughes [Tue, 28 Apr 2020 18:44:00 +0000 (19:44 +0100)]
Refactor traces controller tests
Quincy Morgan [Tue, 28 Apr 2020 17:54:43 +0000 (10:54 -0700)]
Move document-level styling for iD to its stylesheet
Quincy Morgan [Tue, 28 Apr 2020 17:02:01 +0000 (10:02 -0700)]
Fix issue where iD would not take the full height of its iframe
Tom Hughes [Mon, 27 Apr 2020 21:24:28 +0000 (22:24 +0100)]
Refactor more controller tests
translatewiki.net [Mon, 27 Apr 2020 14:53:21 +0000 (16:53 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 26 Apr 2020 21:56:18 +0000 (22:56 +0100)]
Refactor more controller tests
Tom Hughes [Sun, 26 Apr 2020 19:33:06 +0000 (20:33 +0100)]
Refactor more controller tests
Quincy Morgan [Fri, 24 Apr 2020 23:30:40 +0000 (16:30 -0700)]
Update to iD v2.17.3
Tom Hughes [Thu, 23 Apr 2020 19:45:01 +0000 (20:45 +0100)]
Fix deprecation warning
Tom Hughes [Thu, 23 Apr 2020 19:44:44 +0000 (20:44 +0100)]
Update bundle
Tom Hughes [Wed, 22 Apr 2020 15:44:53 +0000 (16:44 +0100)]
Update vagrant provision script for switch to selenium
Tom Hughes [Wed, 22 Apr 2020 15:43:14 +0000 (16:43 +0100)]
Merge remote-tracking branch 'upstream/pull/2598'
Tom Hughes [Wed, 22 Apr 2020 15:42:54 +0000 (16:42 +0100)]
Merge remote-tracking branch 'upstream/pull/2600'
Andy Allan [Wed, 22 Apr 2020 14:45:16 +0000 (16:45 +0200)]
Refactor some more controller tests
Tom Hughes [Wed, 22 Apr 2020 13:42:27 +0000 (14:42 +0100)]
Merge remote-tracking branch 'upstream/pull/2599'
Andy Allan [Wed, 22 Apr 2020 13:08:45 +0000 (15:08 +0200)]
Remove tempfile patch for trace data
Effectively reverts
c0d2ad40c30e5a0837b6012d7b9067d69ce41dd0
This patch is no longer required, since we only use send_data in
combination with Tempfile.read and that all works fine.
Tom Hughes [Wed, 22 Apr 2020 11:23:18 +0000 (12:23 +0100)]
Switch to using selenium for system tests
Tom Hughes [Wed, 22 Apr 2020 12:44:17 +0000 (13:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2596'
Tom Hughes [Wed, 22 Apr 2020 12:34:19 +0000 (13:34 +0100)]
Merge remote-tracking branch 'upstream/pull/2597'
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
Tom Hughes [Wed, 22 Apr 2020 11:22:34 +0000 (12:22 +0100)]
Redirect to the error page for non-existent issues
Tom Hughes [Wed, 22 Apr 2020 11:21:42 +0000 (12:21 +0100)]
Send meta information with error pages
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
Tom Hughes [Mon, 20 Apr 2020 18:14:25 +0000 (19:14 +0100)]
Remove last traces of konacha
translatewiki.net [Mon, 20 Apr 2020 15:01:46 +0000 (17:01 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 19 Apr 2020 18:06:07 +0000 (19:06 +0100)]
Fix new rubocop warnings
Tom Hughes [Sun, 19 Apr 2020 18:04:32 +0000 (19:04 +0100)]
Enable new cops by default
Tom Hughes [Sun, 19 Apr 2020 17:59:28 +0000 (18:59 +0100)]
Update bundle
translatewiki.net [Thu, 16 Apr 2020 15:14:59 +0000 (17:14 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 15 Apr 2020 21:48:28 +0000 (22:48 +0100)]
Cache OpenID provider names on a per-locale basis
Fixes #2591
Tom Hughes [Wed, 15 Apr 2020 21:42:41 +0000 (22:42 +0100)]
Localise formatting of point count for traces
Fixes #2592
Tom Hughes [Wed, 15 Apr 2020 18:23:16 +0000 (19:23 +0100)]
Update bundle
Tom Hughes [Wed, 15 Apr 2020 18:18:10 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/2431'
Tom Hughes [Wed, 15 Apr 2020 18:06:03 +0000 (19:06 +0100)]
Fix rubocop-minitest warnings
Tom Hughes [Wed, 15 Apr 2020 14:51:55 +0000 (15:51 +0100)]
Sort cops
Tom Hughes [Wed, 15 Apr 2020 14:51:43 +0000 (15:51 +0100)]
Fix erblint
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.
Tom Hughes [Wed, 15 Apr 2020 14:41:49 +0000 (15:41 +0100)]
Merge remote-tracking branch 'upstream/pull/2579'
Tom Hughes [Wed, 15 Apr 2020 14:35:37 +0000 (15:35 +0100)]
Merge remote-tracking branch 'upstream/pull/2590'
Andy Allan [Wed, 15 Apr 2020 14:15:52 +0000 (16:15 +0200)]
Add rubocop-minitest
translatewiki.net [Tue, 14 Apr 2020 03:34:16 +0000 (05:34 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 13 Apr 2020 23:03:55 +0000 (00:03 +0100)]
Add tile.openstreetmap.org to security policy