rails.git
11 months agoWhitespace fixes for issues erb files
Andy Allan [Wed, 6 Mar 2019 09:53:40 +0000 (10:53 +0100)]
Whitespace fixes for issues erb files

11 months agoWhitespace fixes for users erb files
Andy Allan [Wed, 6 Mar 2019 09:50:33 +0000 (10:50 +0100)]
Whitespace fixes for users erb files

11 months agoWhitespace fixes for user_blocks erb files
Andy Allan [Wed, 6 Mar 2019 09:42:25 +0000 (10:42 +0100)]
Whitespace fixes for user_blocks erb files

11 months agoWhitespace fixes for notifier erb views
Andy Allan [Wed, 6 Mar 2019 09:34:54 +0000 (10:34 +0100)]
Whitespace fixes for notifier erb views

11 months agoWhitespace fixes for site erb files
Andy Allan [Wed, 6 Mar 2019 09:29:20 +0000 (10:29 +0100)]
Whitespace fixes for site erb files

11 months agoWhitespace fixes in traces erb files
Andy Allan [Wed, 6 Mar 2019 09:17:44 +0000 (10:17 +0100)]
Whitespace fixes in traces erb files

11 months agoPrefer String#match? over butt ugly Regexp#match?
Tom Hughes [Tue, 26 Mar 2019 19:12:18 +0000 (19:12 +0000)]
Prefer String#match? over butt ugly Regexp#match?

11 months agoTarget ruby 2.5.1 to match Ubuntu
Tom Hughes [Tue, 26 Mar 2019 19:08:36 +0000 (19:08 +0000)]
Target ruby 2.5.1 to match Ubuntu

11 months agoRubocop fixes for ruby 2.5
Andy Allan [Wed, 13 Mar 2019 09:33:33 +0000 (10:33 +0100)]
Rubocop fixes for ruby 2.5

11 months agoUpgrade minimum version of ruby to 2.5
Andy Allan [Wed, 13 Mar 2019 09:28:50 +0000 (10:28 +0100)]
Upgrade minimum version of ruby to 2.5

This prepares the way for gems that depend on newer ruby, and also
prepares for the rails 6 upgrade.

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Mar 2019 18:07:09 +0000 (19:07 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoQueue trace related jobs in the traces queue
Tom Hughes [Sun, 24 Mar 2019 17:08:57 +0000 (17:08 +0000)]
Queue trace related jobs in the traces queue

11 months agoMerge remote-tracking branch 'upstream/pull/2131'
Tom Hughes [Sat, 23 Mar 2019 12:08:41 +0000 (12:08 +0000)]
Merge remote-tracking branch 'upstream/pull/2131'

11 months agoMerge remote-tracking branch 'upstream/pull/2186'
Tom Hughes [Sat, 23 Mar 2019 12:01:05 +0000 (12:01 +0000)]
Merge remote-tracking branch 'upstream/pull/2186'

11 months agoUse strings consistently for database/api/gpx status
Tom Hughes [Sat, 23 Mar 2019 11:59:42 +0000 (11:59 +0000)]
Use strings consistently for database/api/gpx status

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Mar 2019 10:04:08 +0000 (11:04 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoMove more api-only methods into api_controller
Andy Allan [Wed, 20 Mar 2019 13:51:57 +0000 (14:51 +0100)]
Move more api-only methods into api_controller

11 months agoMark all methods in api_controller and application_controller as private
Andy Allan [Wed, 20 Mar 2019 13:37:39 +0000 (14:37 +0100)]
Mark all methods in api_controller and application_controller as private

They aren't designed to be used as request endpoints, so there's no
need for them to be public.

11 months agoUse a lambda in order to pass parameters in before_actions
Andy Allan [Wed, 20 Mar 2019 14:07:33 +0000 (15:07 +0100)]
Use a lambda in order to pass parameters in before_actions

This avoid calling methods on a new instance of the controller, and
therefore allows these methods to be marked as private.

As a bonus, rubocop can now parse them and warn when they refer to
actions that don't exist in the controller.

11 months agoMove the authorize method to api_controller
Andy Allan [Wed, 20 Mar 2019 13:36:43 +0000 (14:36 +0100)]
Move the authorize method to api_controller

11 months agoSimplify deny_access handling
Andy Allan [Wed, 20 Mar 2019 13:27:05 +0000 (14:27 +0100)]
Simplify deny_access handling

Now that we have all api controllers inheriting from a common base,
it's easier to override the deny_access handler without having to
switch between both.

Fixes #2064

11 months agoRefactor api controllers to inherit from a common ApiController
Andy Allan [Wed, 20 Mar 2019 13:16:15 +0000 (14:16 +0100)]
Refactor api controllers to inherit from a common ApiController

11 months agoUse an enumerator for gpx.points, and process the the points in batches
Andy Allan [Wed, 20 Mar 2019 09:14:11 +0000 (10:14 +0100)]
Use an enumerator for gpx.points, and process the the points in batches

11 months agoRaise exception if there is an error, and import tracepoints in batches
Andy Allan [Wed, 6 Mar 2019 08:27:33 +0000 (09:27 +0100)]
Raise exception if there is an error, and import tracepoints in batches

11 months agoUse activerecord-import for bulk importing tracepoint records
Andy Allan [Wed, 23 Jan 2019 17:12:30 +0000 (18:12 +0100)]
Use activerecord-import for bulk importing tracepoint records

Non-rigourous testing shows a significant speedup, even on ssds.

11 months agoFix travis
Tom Hughes [Tue, 19 Mar 2019 14:08:43 +0000 (14:08 +0000)]
Fix travis

11 months agoMerge remote-tracking branch 'upstream/pull/2182'
Tom Hughes [Tue, 19 Mar 2019 13:29:49 +0000 (13:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2182'

11 months agoAdd banner against EU Copyright Directive
Michael Reichert [Mon, 18 Mar 2019 21:16:25 +0000 (22:16 +0100)]
Add banner against EU Copyright Directive

Set end date to 2019-03-26 because the topic is tabled on 26 March
according to the agenda.

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Mar 2019 07:57:33 +0000 (08:57 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoMove application.yml check to config initializer
Tom Hughes [Sun, 17 Mar 2019 10:49:21 +0000 (10:49 +0000)]
Move application.yml check to config initializer

11 months agoMove status into the settings object
Tom Hughes [Sat, 16 Mar 2019 16:29:12 +0000 (16:29 +0000)]
Move status into the settings object

Only the very early boot code needs to look at the value
from the environment directly.

11 months agoFix database offline mode
Tom Hughes [Sat, 16 Mar 2019 16:52:08 +0000 (16:52 +0000)]
Fix database offline mode

11 months agoSort gitignore
Tom Hughes [Sat, 16 Mar 2019 15:41:35 +0000 (15:41 +0000)]
Sort gitignore

11 months agoAdd comment
Tom Hughes [Sat, 16 Mar 2019 15:40:23 +0000 (15:40 +0000)]
Add comment

11 months agoMerge remote-tracking branch 'upstream/pull/2177'
Tom Hughes [Sat, 16 Mar 2019 15:39:03 +0000 (15:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2177'

11 months agoMerge remote-tracking branch 'upstream/pull/2164'
Tom Hughes [Sat, 16 Mar 2019 15:31:29 +0000 (15:31 +0000)]
Merge remote-tracking branch 'upstream/pull/2164'

11 months agoRubocop fix
Andy Allan [Wed, 13 Mar 2019 11:14:31 +0000 (12:14 +0100)]
Rubocop fix

11 months agoRubocop fixes
Andy Allan [Wed, 13 Mar 2019 11:06:19 +0000 (12:06 +0100)]
Rubocop fixes

11 months agoMove changeset builder views to the api namespace
Andy Allan [Wed, 13 Mar 2019 11:04:54 +0000 (12:04 +0100)]
Move changeset builder views to the api namespace

11 months agoMove changeset XML generation to a view
Frederik Ramm [Fri, 1 Mar 2019 00:11:19 +0000 (01:11 +0100)]
Move changeset XML generation to a view

11 months agoAdd missing dependency
Tom Hughes [Fri, 15 Mar 2019 10:44:16 +0000 (10:44 +0000)]
Add missing dependency

11 months agoAdd missing dependencies
Tom Hughes [Fri, 15 Mar 2019 10:18:29 +0000 (10:18 +0000)]
Add missing dependencies

11 months agoUpdate to rails 5.2.2.1
Tom Hughes [Fri, 15 Mar 2019 09:30:17 +0000 (09:30 +0000)]
Update to rails 5.2.2.1

11 months agoUpdate bundle
Tom Hughes [Fri, 15 Mar 2019 09:27:38 +0000 (09:27 +0000)]
Update bundle

11 months agoAdd Spanish attribution to copyright page
Tom Hughes [Fri, 15 Mar 2019 09:17:28 +0000 (09:17 +0000)]
Add Spanish attribution to copyright page

Fixes #2179

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Mar 2019 12:14:50 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoRemove application.yml step from travis config
Andy Allan [Wed, 13 Mar 2019 17:41:57 +0000 (18:41 +0100)]
Remove application.yml step from travis config

11 months agoProvide a helpful warning if there's an application.yml file detected
Andy Allan [Wed, 13 Mar 2019 17:20:08 +0000 (18:20 +0100)]
Provide a helpful warning if there's an application.yml file detected

11 months agoAdd some settings validations
Andy Allan [Wed, 13 Mar 2019 16:57:51 +0000 (17:57 +0100)]
Add some settings validations

11 months agoUpdate documentation for new approach to settings
Andy Allan [Wed, 13 Mar 2019 16:54:41 +0000 (17:54 +0100)]
Update documentation for new approach to settings

11 months agoInstruct sprockets to recompile this file based on the settings files changing
Andy Allan [Wed, 13 Mar 2019 16:51:43 +0000 (17:51 +0100)]
Instruct sprockets to recompile this file based on the settings files changing

11 months agoOnly take the STATUS configuration from the environment
Andy Allan [Wed, 13 Mar 2019 16:33:28 +0000 (17:33 +0100)]
Only take the STATUS configuration from the environment

This allows us to remove the preinitializer-based configuration parsing.

11 months agoDrop the old environment variable parsing
Andy Allan [Wed, 13 Mar 2019 15:40:31 +0000 (16:40 +0100)]
Drop the old environment variable parsing

It's likely unused, and incompatible with environment variable parsing from Config

11 months agoMove all settings to settings.yml
Andy Allan [Wed, 13 Mar 2019 15:38:03 +0000 (16:38 +0100)]
Move all settings to settings.yml

We leave the STATUS setting alone, since it's required before rails
boots. The test-specific settings now live in config/settings/test.yml

11 months agoInstall config gem for settings management
Andy Allan [Wed, 13 Mar 2019 13:05:39 +0000 (14:05 +0100)]
Install config gem for settings management

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Mar 2019 10:29:31 +0000 (11:29 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoPrevent leading and trailing whitespace on email addresses
Tom Hughes [Fri, 8 Mar 2019 11:17:51 +0000 (11:17 +0000)]
Prevent leading and trailing whitespace on email addresses

11 months agoStrip leading and trailing whitespace for email authentication
Tom Hughes [Fri, 8 Mar 2019 10:58:42 +0000 (10:58 +0000)]
Strip leading and trailing whitespace for email authentication

Fixes #2173

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Mar 2019 15:23:12 +0000 (16:23 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoMerge remote-tracking branch 'upstream/pull/2167'
Tom Hughes [Wed, 6 Mar 2019 17:23:46 +0000 (17:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2167'

11 months agoSilence the simplecov output message
Andy Allan [Wed, 6 Mar 2019 08:54:05 +0000 (09:54 +0100)]
Silence the simplecov output message

It's very rare for the information in this message to be useful or
actionable when running the tests, so it's best to silence the message.

11 months agoUpdate OS copyright year
Richard Fairhurst [Thu, 28 Feb 2019 21:44:44 +0000 (21:44 +0000)]
Update OS copyright year

11 months agoMerge remote-tracking branch 'upstream/pull/2161'
Tom Hughes [Thu, 28 Feb 2019 19:17:40 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2161'

11 months agoMerge remote-tracking branch 'upstream/pull/2160'
Tom Hughes [Thu, 28 Feb 2019 18:58:05 +0000 (18:58 +0000)]
Merge remote-tracking branch 'upstream/pull/2160'

11 months agoMove the api trace methods into a separate controller under the api namespace
Andy Allan [Sun, 24 Feb 2019 15:21:29 +0000 (16:21 +0100)]
Move the api trace methods into a separate controller under the api namespace

11 months agoFix test file name
Andy Allan [Sun, 24 Feb 2019 15:06:07 +0000 (16:06 +0100)]
Fix test file name

11 months agoMove the amf and swf controllers into the api namespace
Andy Allan [Sun, 24 Feb 2019 14:52:20 +0000 (15:52 +0100)]
Move the amf and swf controllers into the api namespace

11 months agoMove the notes api methods into a controller in the api namespace
Andy Allan [Sun, 24 Feb 2019 14:46:25 +0000 (15:46 +0100)]
Move the notes api methods into a controller in the api namespace

11 months agoMove the user api methods into a separate controller in the api namespace
Andy Allan [Sun, 24 Feb 2019 13:34:15 +0000 (14:34 +0100)]
Move the user api methods into a separate controller in the api namespace

11 months agoMove node/way/relation/old_* controllers into the api namespace
Andy Allan [Sun, 24 Feb 2019 12:37:03 +0000 (13:37 +0100)]
Move node/way/relation/old_* controllers into the api namespace

11 months agoUpdate to iD v2.14.3
Quincy Morgan [Tue, 26 Feb 2019 18:52:10 +0000 (13:52 -0500)]
Update to iD v2.14.3

12 months agoFlip header image horizontally on RTL pages
Tom Hughes [Mon, 25 Feb 2019 18:58:19 +0000 (18:58 +0000)]
Flip header image horizontally on RTL pages

Fixes #2158

12 months agoPrevent reversal of sprite positions on welcome screen
Tom Hughes [Mon, 25 Feb 2019 18:50:40 +0000 (18:50 +0000)]
Prevent reversal of sprite positions on welcome screen

Fixes #2156

12 months agoAvoid CSP issues with OpenID login
Tom Hughes [Mon, 25 Feb 2019 11:44:24 +0000 (11:44 +0000)]
Avoid CSP issues with OpenID login

To avoid Chrom getting upset about sending form data to sites
that our policy doesn't allow, even when it isn't, use Javascript
to jump straight to Omniauth as the direct OpenID based login
buttons were already doing.

Fixes #1909

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Feb 2019 09:54:34 +0000 (10:54 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoAllow loading of our manifest
Tom Hughes [Sun, 24 Feb 2019 22:40:01 +0000 (22:40 +0000)]
Allow loading of our manifest

12 months agoMove the user preferences controller into the api namespace
Andy Allan [Sun, 24 Feb 2019 11:47:26 +0000 (12:47 +0100)]
Move the user preferences controller into the api namespace

12 months agoMove the search controller to the api namespace
Andy Allan [Sun, 24 Feb 2019 11:42:07 +0000 (12:42 +0100)]
Move the search controller to the api namespace

12 months agoMove the api methods from changeset_comments_controller into the api namespaced contr...
Andy Allan [Sun, 24 Feb 2019 11:38:09 +0000 (12:38 +0100)]
Move the api methods from changeset_comments_controller into the api namespaced controller

12 months agoMove the api methods from changesets_controller into the api namespaced controller
Andy Allan [Sun, 24 Feb 2019 11:18:31 +0000 (12:18 +0100)]
Move the api methods from changesets_controller into the api namespaced controller

12 months agoMove map method to its own controller
Andy Allan [Sun, 24 Feb 2019 09:42:01 +0000 (10:42 +0100)]
Move map method to its own controller

12 months agoMove the changes api to its own controller
Andy Allan [Sun, 24 Feb 2019 09:27:48 +0000 (10:27 +0100)]
Move the changes api to its own controller

12 months agoMove the permissions call out of api_controller
Andy Allan [Sat, 23 Feb 2019 15:06:30 +0000 (16:06 +0100)]
Move the permissions call out of api_controller

12 months agoRename api controller test files
Andy Allan [Sat, 23 Feb 2019 14:59:45 +0000 (15:59 +0100)]
Rename api controller test files

12 months agoMove the trackpoints call into its own controller (and rename to tracepoints)
Andy Allan [Sat, 23 Feb 2019 14:53:49 +0000 (15:53 +0100)]
Move the trackpoints call into its own controller (and rename to tracepoints)

12 months agoMove the capabilities call out of api_controller
Andy Allan [Sat, 23 Feb 2019 13:36:02 +0000 (14:36 +0100)]
Move the capabilities call out of api_controller

12 months agoImprove detection of browsers needing ES6 shims
Tom Hughes [Fri, 22 Feb 2019 15:41:33 +0000 (15:41 +0000)]
Improve detection of browsers needing ES6 shims

12 months agoMerge remote-tracking branch 'upstream/pull/2153'
Tom Hughes [Thu, 21 Feb 2019 23:00:55 +0000 (23:00 +0000)]
Merge remote-tracking branch 'upstream/pull/2153'

12 months agoUpdate to iD v2.14.2
Quincy Morgan [Thu, 21 Feb 2019 22:06:43 +0000 (17:06 -0500)]
Update to iD v2.14.2

12 months agoMerge remote-tracking branch 'upstream/pull/2152'
Tom Hughes [Wed, 20 Feb 2019 23:57:50 +0000 (23:57 +0000)]
Merge remote-tracking branch 'upstream/pull/2152'

12 months agoUpdate to iD v2.14.1
Quincy Morgan [Wed, 20 Feb 2019 23:30:22 +0000 (18:30 -0500)]
Update to iD v2.14.1

12 months agoMerge remote-tracking branch 'upstream/pull/2151'
Tom Hughes [Wed, 20 Feb 2019 22:13:50 +0000 (22:13 +0000)]
Merge remote-tracking branch 'upstream/pull/2151'

12 months agoAvoid bundler 2.x for now
Tom Hughes [Wed, 20 Feb 2019 21:46:21 +0000 (21:46 +0000)]
Avoid bundler 2.x for now

Fixes #2149

12 months agoUpdate to iD v2.14.0
Quincy Morgan [Wed, 20 Feb 2019 21:43:54 +0000 (16:43 -0500)]
Update to iD v2.14.0

12 months agoSet language and text direction properly on the copyright page
Tom Hughes [Tue, 19 Feb 2019 10:06:58 +0000 (10:06 +0000)]
Set language and text direction properly on the copyright page

Also add style overrides for explicit LTR and RTL text that work
independently of the main page styling.

Fixes #2148

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Feb 2019 07:13:52 +0000 (08:13 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoRevert to rinku 2.0.4
Tom Hughes [Thu, 14 Feb 2019 21:25:34 +0000 (21:25 +0000)]
Revert to rinku 2.0.4

12 months agoRevert to bootsnap 1.3.2
Tom Hughes [Thu, 14 Feb 2019 19:24:46 +0000 (19:24 +0000)]
Revert to bootsnap 1.3.2

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Feb 2019 08:24:45 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoUpdate bundle
Tom Hughes [Wed, 13 Feb 2019 18:45:32 +0000 (18:45 +0000)]
Update bundle