]> git.openstreetmap.org Git - rails.git/log
rails.git
5 years agoRefactor notes#mine to simplify code
Andy Allan [Wed, 27 Mar 2019 16:15:18 +0000 (17:15 +0100)]
Refactor notes#mine to simplify code

5 years agoerblint: fix remaining single quoted strings
Tom Hughes [Wed, 27 Mar 2019 16:15:19 +0000 (16:15 +0000)]
erblint: fix remaining single quoted strings

5 years agoMerge remote-tracking branch 'upstream/pull/2189'
Tom Hughes [Wed, 27 Mar 2019 12:07:11 +0000 (12:07 +0000)]
Merge remote-tracking branch 'upstream/pull/2189'

5 years agoMerge remote-tracking branch 'upstream/pull/2188'
Tom Hughes [Wed, 27 Mar 2019 10:43:23 +0000 (10:43 +0000)]
Merge remote-tracking branch 'upstream/pull/2188'

5 years agoUse the trace jobs for creating and destroy traces via the API
Andy Allan [Wed, 27 Mar 2019 10:40:50 +0000 (11:40 +0100)]
Use the trace jobs for creating and destroy traces via the API

5 years agoMerge remote-tracking branch 'upstream/pull/2187'
Tom Hughes [Wed, 27 Mar 2019 10:38:46 +0000 (10:38 +0000)]
Merge remote-tracking branch 'upstream/pull/2187'

5 years agoCheck validity token in changesets controller
Andy Allan [Wed, 27 Mar 2019 10:24:31 +0000 (11:24 +0100)]
Check validity token in changesets controller

It makes no difference today, but prevents problems in future if
methods accepting post requests are added to this controller in future.

5 years agoerblint: avoid parentheses for method calls with no arguments
Andy Allan [Wed, 27 Mar 2019 09:59:10 +0000 (10:59 +0100)]
erblint: avoid parentheses for method calls with no arguments

5 years agoerblint: prefer double quoted strings
Andy Allan [Wed, 27 Mar 2019 09:57:00 +0000 (10:57 +0100)]
erblint: prefer double quoted strings

5 years agoExclude most views from string literal checks
Andy Allan [Wed, 27 Mar 2019 09:42:16 +0000 (10:42 +0100)]
Exclude most views from string literal checks

This allows us to work through them slowly, while preventing errors
from creeping into directories that already pass.

5 years agoerblint: Add or remove curly braces around hash parameters as required
Andy Allan [Wed, 27 Mar 2019 09:30:48 +0000 (10:30 +0100)]
erblint: Add or remove curly braces around hash parameters as required

5 years agoerblint: use hash rocket syntax
Andy Allan [Wed, 27 Mar 2019 09:03:56 +0000 (10:03 +0100)]
erblint: use hash rocket syntax

5 years agoMerge remote-tracking branch 'upstream/pull/2168'
Tom Hughes [Tue, 26 Mar 2019 21:11:51 +0000 (21:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2168'

5 years agoExclude files in the vendor directory from erb-lint rubocop checks
Tom Hughes [Tue, 26 Mar 2019 20:22:32 +0000 (20:22 +0000)]
Exclude files in the vendor directory from erb-lint rubocop checks

5 years agoFix capitalisation of div tag
Tom Hughes [Tue, 26 Mar 2019 19:41:44 +0000 (19:41 +0000)]
Fix capitalisation of div tag

5 years agoUpdate coding style section of the contribution guide to describe our use of rubocop...
Andy Allan [Wed, 6 Mar 2019 10:44:59 +0000 (11:44 +0100)]
Update coding style section of the contribution guide to describe our use of rubocop and erblint

5 years agoAdd erblint to travis
Andy Allan [Wed, 6 Mar 2019 10:38:44 +0000 (11:38 +0100)]
Add erblint to travis

5 years agoIntroduce erb-lint for linting erb files
Andy Allan [Wed, 6 Mar 2019 10:30:40 +0000 (11:30 +0100)]
Introduce erb-lint for linting erb files

This also allows running rubocop on the ruby code within the erb
files.

5 years agoWhitespace fixes to various erb files
Andy Allan [Wed, 6 Mar 2019 10:18:10 +0000 (11:18 +0100)]
Whitespace fixes to various erb files

5 years agoWhitespace fixes for messages erb files
Andy Allan [Wed, 6 Mar 2019 10:13:47 +0000 (11:13 +0100)]
Whitespace fixes for messages erb files

5 years agoWhitespace fixes for layouts erb files
Andy Allan [Wed, 6 Mar 2019 10:11:15 +0000 (11:11 +0100)]
Whitespace fixes for layouts erb files

5 years agoWhitespace fixes for diary_entry erb files
Andy Allan [Wed, 6 Mar 2019 10:02:54 +0000 (11:02 +0100)]
Whitespace fixes for diary_entry erb files

5 years agoWhitespace fixes for browse erb files
Andy Allan [Wed, 6 Mar 2019 09:59:55 +0000 (10:59 +0100)]
Whitespace fixes for browse erb files

5 years agoWhitespace fixes for errors erb files
Andy Allan [Wed, 6 Mar 2019 09:54:13 +0000 (10:54 +0100)]
Whitespace fixes for errors erb files

5 years agoWhitespace fixes for oauth_clients erb files
Andy Allan [Wed, 6 Mar 2019 09:53:57 +0000 (10:53 +0100)]
Whitespace fixes for oauth_clients erb files

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

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

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

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

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

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

5 years 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?

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

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

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

5 years agoMerge remote-tracking branch 'upstream/pull/2175'
Tom Hughes [Tue, 26 Mar 2019 19:14:04 +0000 (19:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2175'

5 years 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?

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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