]> git.openstreetmap.org Git - rails.git/log
rails.git
4 years agoUse bootstrap_form as the formbuilder for GPX upload form
Andy Allan [Wed, 24 Jun 2020 13:26:07 +0000 (15:26 +0200)]
Use bootstrap_form as the formbuilder for GPX upload form

This also uses the recommended bs-custom-file-input javascript plugin
for the file input control.

4 years agoAdd bootstrap_form formbuilder gem
Andy Allan [Wed, 24 Jun 2020 10:24:27 +0000 (12:24 +0200)]
Add bootstrap_form formbuilder gem

4 years agoRemove the red colour override, and use the bootstrap default
Andy Allan [Thu, 11 Jun 2020 09:18:26 +0000 (11:18 +0200)]
Remove the red colour override, and use the bootstrap default

Full red clashes badly when side-by-side with our blues

4 years agoRefactor away from global form control styling
Andy Allan [Wed, 10 Jun 2020 18:33:18 +0000 (20:33 +0200)]
Refactor away from global form control styling

This enables forms to be converted one-by-one to bootstrap. Without this
refactoring, these global styles interfere with form control styling from
bootstrap.

The rearrangement of the search and directions styling is to solve CSS selector specitivity issues.

4 years agoMerge remote-tracking branch 'upstream/pull/2651'
Tom Hughes [Wed, 10 Jun 2020 10:05:22 +0000 (11:05 +0100)]
Merge remote-tracking branch 'upstream/pull/2651'

4 years agoRework user#set_status and #delete to avoid GET requests
Andy Allan [Wed, 10 Jun 2020 09:49:18 +0000 (11:49 +0200)]
Rework user#set_status and #delete to avoid GET requests

This renames the delete action to destroy, and starts using resourceful
routing for user actions.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 8 Jun 2020 15:12:34 +0000 (17:12 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoRename `many` keys to `other` for the cs locale.
Tom Hughes [Sun, 7 Jun 2020 21:35:37 +0000 (22:35 +0100)]
Rename `many` keys to `other` for the cs locale.

Fixes #2645

4 years agoUpdate bundle
Tom Hughes [Sun, 7 Jun 2020 18:19:10 +0000 (19:19 +0100)]
Update bundle

4 years agoMore improvements to locale selection for the data browser
Tom Hughes [Sun, 7 Jun 2020 18:10:48 +0000 (19:10 +0100)]
More improvements to locale selection for the data browser

Use the browser language preferences for non-logged in users.

4 years agoMerge remote-tracking branch 'upstream/pull/2642'
Tom Hughes [Thu, 4 Jun 2020 16:40:13 +0000 (17:40 +0100)]
Merge remote-tracking branch 'upstream/pull/2642'

4 years agoImprove selection of name to display in data browser
Tom Hughes [Thu, 4 Jun 2020 16:25:13 +0000 (17:25 +0100)]
Improve selection of name to display in data browser

If the user is logged in then consider all their preferred
languages rather than just the UI language, and use the full
locale matching algorithm instead of just checking parents.

Fixes #2636

4 years agoImprove locale selection algorithm
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.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Jun 2020 15:59:12 +0000 (17:59 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoFix new rubocop warnings
Tom Hughes [Wed, 3 Jun 2020 16:47:35 +0000 (17:47 +0100)]
Fix new rubocop warnings

4 years agoUpdate bundle
Tom Hughes [Wed, 3 Jun 2020 16:41:38 +0000 (17:41 +0100)]
Update bundle

4 years agoMerge remote-tracking branch 'upstream/pull/2641'
Tom Hughes [Wed, 3 Jun 2020 16:31:12 +0000 (17:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2641'

4 years agoRename friend to friendship in notifier
Andy Allan [Wed, 3 Jun 2020 16:29:08 +0000 (18:29 +0200)]
Rename friend to friendship in notifier

Followup to #2269

4 years agoMove make_friend and remove_friend to friendships controller
Andy Allan [Wed, 3 Jun 2020 16:23:07 +0000 (18:23 +0200)]
Move make_friend and remove_friend to friendships controller

4 years agoMerge remote-tracking branch 'upstream/pull/2639'
Tom Hughes [Wed, 3 Jun 2020 16:19:03 +0000 (17:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2639'

4 years agoMerge remote-tracking branch 'upstream/pull/2638'
Tom Hughes [Wed, 3 Jun 2020 16:13:49 +0000 (17:13 +0100)]
Merge remote-tracking branch 'upstream/pull/2638'

4 years agoMerge remote-tracking branch 'upstream/pull/2637'
Tom Hughes [Wed, 3 Jun 2020 16:09:07 +0000 (17:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2637'

4 years agoMerge remote-tracking branch 'upstream/pull/2640'
Tom Hughes [Wed, 3 Jun 2020 16:07:31 +0000 (17:07 +0100)]
Merge remote-tracking branch 'upstream/pull/2640'

4 years agoMove friendship related tests to separate file
Andy Allan [Wed, 3 Jun 2020 15:51:11 +0000 (17:51 +0200)]
Move friendship related tests to separate file

4 years agoConvert lib files to model concerns
Andy Allan [Wed, 3 Jun 2020 14:44:26 +0000 (16:44 +0200)]
Convert lib files to model concerns

4 years agoRemove some unused scripts
Andy Allan [Wed, 3 Jun 2020 14:14:58 +0000 (16:14 +0200)]
Remove some unused scripts

4 years agoMerge pull request #2624 from francois2metz/diary-entry
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

4 years agoUse rails 6.0 framework defaults
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.

4 years agoRemove the framework defaults initializer for 5.2
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

4 years agoRemove ineffective query cache disable initializer
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.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Jun 2020 20:38:37 +0000 (22:38 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate bundle
Tom Hughes [Wed, 27 May 2020 18:11:58 +0000 (19:11 +0100)]
Update bundle

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 26 May 2020 15:14:43 +0000 (17:14 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate bundle
Tom Hughes [Thu, 21 May 2020 17:50:23 +0000 (18:50 +0100)]
Update bundle

4 years agoUpdate to rails 6.0.3.1
Tom Hughes [Mon, 18 May 2020 17:10:28 +0000 (18:10 +0100)]
Update to rails 6.0.3.1

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 May 2020 14:12:18 +0000 (16:12 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2626'
Tom Hughes [Wed, 13 May 2020 21:42:33 +0000 (22:42 +0100)]
Merge remote-tracking branch 'upstream/pull/2626'

4 years agoRemove unused test helper
Andy Allan [Wed, 13 May 2020 16:15:07 +0000 (18:15 +0200)]
Remove unused test helper

4 years agoRefactor user controller tests
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.

4 years agoRefactor api traces_controller tests
Andy Allan [Wed, 13 May 2020 16:08:07 +0000 (18:08 +0200)]
Refactor api traces_controller tests

4 years agoDon't try and resize images that aren't resizable
Tom Hughes [Wed, 13 May 2020 10:29:49 +0000 (11:29 +0100)]
Don't try and resize images that aren't resizable

4 years agoAttach resized images to notification emails
Tom Hughes [Wed, 13 May 2020 10:29:02 +0000 (11:29 +0100)]
Attach resized images to notification emails

Fixes #2625

4 years agoFix new rubocop warnings
Tom Hughes [Tue, 12 May 2020 18:18:45 +0000 (19:18 +0100)]
Fix new rubocop warnings

4 years agoUpdate bundle
Tom Hughes [Tue, 12 May 2020 18:17:03 +0000 (19:17 +0100)]
Update bundle

4 years agoAdd link to my diary in the diary index.
François de Metz [Tue, 12 May 2020 09:37:43 +0000 (11:37 +0200)]
Add link to my diary in the diary index.

4 years agoRefactor the link to create a new entry diary.
François de Metz [Tue, 12 May 2020 09:27:08 +0000 (11:27 +0200)]
Refactor the link to create a new entry diary.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 May 2020 15:43:21 +0000 (17:43 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoRefactor users_controller_test and user_preferences_controller_test
Tom Hughes [Thu, 7 May 2020 18:34:48 +0000 (19:34 +0100)]
Refactor users_controller_test and user_preferences_controller_test

4 years agoFix issue with iD embedded document sometimes showing scrollbars
Quincy Morgan [Thu, 7 May 2020 16:11:45 +0000 (09:11 -0700)]
Fix issue with iD embedded document sometimes showing scrollbars

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 May 2020 15:15:43 +0000 (17:15 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate to rails 6.0.3
Tom Hughes [Wed, 6 May 2020 19:36:23 +0000 (20:36 +0100)]
Update to rails 6.0.3

4 years agoRefactor notes_controller_test
Tom Hughes [Wed, 6 May 2020 17:39:48 +0000 (18:39 +0100)]
Refactor notes_controller_test

4 years agoAdd test for browsing a note closed by a deleted user
Tom Hughes [Wed, 6 May 2020 17:06:45 +0000 (18:06 +0100)]
Add test for browsing a note closed by a deleted user

4 years agoMerge remote-tracking branch 'upstream/pull/2613'
Tom Hughes [Wed, 6 May 2020 15:16:38 +0000 (16:16 +0100)]
Merge remote-tracking branch 'upstream/pull/2613'

4 years agoMore controller test refactoring
Andy Allan [Wed, 6 May 2020 14:51:04 +0000 (16:51 +0200)]
More controller test refactoring

4 years agoLook at all note comments to find the close event
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

4 years agoRefactor permissions_controller_test
Tom Hughes [Tue, 5 May 2020 18:40:52 +0000 (19:40 +0100)]
Refactor permissions_controller_test

4 years agoRefactor versions_controller_test
Tom Hughes [Tue, 5 May 2020 18:36:38 +0000 (19:36 +0100)]
Refactor versions_controller_test

4 years agoRefactor tracepoints_controller_test
Tom Hughes [Tue, 5 May 2020 18:28:42 +0000 (19:28 +0100)]
Refactor tracepoints_controller_test

4 years agoRemove unused function
Tom Hughes [Tue, 5 May 2020 18:20:21 +0000 (19:20 +0100)]
Remove unused function

4 years agoRefactor map_controller_test
Tom Hughes [Tue, 5 May 2020 18:19:43 +0000 (19:19 +0100)]
Refactor map_controller_test

4 years agoSwitch oauth integration tests to use new shared helper
Tom Hughes [Tue, 5 May 2020 17:03:49 +0000 (18:03 +0100)]
Switch oauth integration tests to use new shared helper

4 years agoRefactor changeset comments API controller tests
Tom Hughes [Tue, 5 May 2020 16:45:05 +0000 (17:45 +0100)]
Refactor changeset comments API controller tests

4 years agoAdd helper methods for making OAuth signed requests
Tom Hughes [Tue, 5 May 2020 16:44:33 +0000 (17:44 +0100)]
Add helper methods for making OAuth signed requests

4 years agoRefactor the AMF controller API tests
Tom Hughes [Tue, 5 May 2020 16:44:12 +0000 (17:44 +0100)]
Refactor the AMF controller API tests

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 May 2020 14:14:24 +0000 (16:14 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 May 2020 13:59:34 +0000 (15:59 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate bundle
Tom Hughes [Thu, 30 Apr 2020 17:49:58 +0000 (18:49 +0100)]
Update bundle

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 Apr 2020 14:58:29 +0000 (16:58 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2605'
Tom Hughes [Wed, 29 Apr 2020 18:11:52 +0000 (19:11 +0100)]
Merge remote-tracking branch 'upstream/pull/2605'

4 years agoRefactor changesets_controller_test
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

4 years agoRefactor more controller tests
Andy Allan [Wed, 29 Apr 2020 15:28:42 +0000 (17:28 +0200)]
Refactor more controller tests

4 years agoMerge remote-tracking branch 'upstream/pull/2601'
Tom Hughes [Tue, 28 Apr 2020 18:44:43 +0000 (19:44 +0100)]
Merge remote-tracking branch 'upstream/pull/2601'

4 years agoRefactor traces controller tests
Tom Hughes [Tue, 28 Apr 2020 18:44:00 +0000 (19:44 +0100)]
Refactor traces controller tests

4 years agoMove document-level styling for iD to its stylesheet
Quincy Morgan [Tue, 28 Apr 2020 17:54:43 +0000 (10:54 -0700)]
Move document-level styling for iD to its stylesheet

4 years agoFix issue where iD would not take the full height of its iframe
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

4 years agoRefactor more controller tests
Tom Hughes [Mon, 27 Apr 2020 21:24:28 +0000 (22:24 +0100)]
Refactor more controller tests

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Apr 2020 14:53:21 +0000 (16:53 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoRefactor more controller tests
Tom Hughes [Sun, 26 Apr 2020 21:56:18 +0000 (22:56 +0100)]
Refactor more controller tests

4 years agoRefactor more controller tests
Tom Hughes [Sun, 26 Apr 2020 19:33:06 +0000 (20:33 +0100)]
Refactor more controller tests

4 years agoUpdate to iD v2.17.3
Quincy Morgan [Fri, 24 Apr 2020 23:30:40 +0000 (16:30 -0700)]
Update to iD v2.17.3

4 years agoFix deprecation warning
Tom Hughes [Thu, 23 Apr 2020 19:45:01 +0000 (20:45 +0100)]
Fix deprecation warning

4 years agoUpdate bundle
Tom Hughes [Thu, 23 Apr 2020 19:44:44 +0000 (20:44 +0100)]
Update bundle

4 years agoUpdate vagrant provision script for switch to selenium
Tom Hughes [Wed, 22 Apr 2020 15:44:53 +0000 (16:44 +0100)]
Update vagrant provision script for switch to selenium

4 years agoMerge remote-tracking branch 'upstream/pull/2598'
Tom Hughes [Wed, 22 Apr 2020 15:43:14 +0000 (16:43 +0100)]
Merge remote-tracking branch 'upstream/pull/2598'

4 years agoMerge remote-tracking branch 'upstream/pull/2600'
Tom Hughes [Wed, 22 Apr 2020 15:42:54 +0000 (16:42 +0100)]
Merge remote-tracking branch 'upstream/pull/2600'

4 years agoRefactor some more controller tests
Andy Allan [Wed, 22 Apr 2020 14:45:16 +0000 (16:45 +0200)]
Refactor some more controller tests

4 years agoMerge remote-tracking branch 'upstream/pull/2599'
Tom Hughes [Wed, 22 Apr 2020 13:42:27 +0000 (14:42 +0100)]
Merge remote-tracking branch 'upstream/pull/2599'

4 years agoRemove tempfile patch for trace data
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.

4 years agoSwitch to using selenium for system tests
Tom Hughes [Wed, 22 Apr 2020 11:23:18 +0000 (12:23 +0100)]
Switch to using selenium for system tests

4 years 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'

4 years 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'

4 years 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

4 years 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

4 years 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

4 years 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

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

4 years 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.

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

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