]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 27 Mar 2019 09:57:00 +0000 (10:57 +0100)]
erblint: prefer double quoted strings
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.
Andy Allan [Wed, 27 Mar 2019 09:30:48 +0000 (10:30 +0100)]
erblint: Add or remove curly braces around hash parameters as required
Andy Allan [Wed, 27 Mar 2019 09:03:56 +0000 (10:03 +0100)]
erblint: use hash rocket syntax
Tom Hughes [Tue, 26 Mar 2019 21:11:51 +0000 (21:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2168'
Tom Hughes [Tue, 26 Mar 2019 20:22:32 +0000 (20:22 +0000)]
Exclude files in the vendor directory from erb-lint rubocop checks
Tom Hughes [Tue, 26 Mar 2019 19:41:44 +0000 (19:41 +0000)]
Fix capitalisation of div tag
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
Andy Allan [Wed, 6 Mar 2019 10:38:44 +0000 (11:38 +0100)]
Add erblint to travis
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.
Andy Allan [Wed, 6 Mar 2019 10:18:10 +0000 (11:18 +0100)]
Whitespace fixes to various erb files
Andy Allan [Wed, 6 Mar 2019 10:13:47 +0000 (11:13 +0100)]
Whitespace fixes for messages erb files
Andy Allan [Wed, 6 Mar 2019 10:11:15 +0000 (11:11 +0100)]
Whitespace fixes for layouts erb files
Andy Allan [Wed, 6 Mar 2019 10:02:54 +0000 (11:02 +0100)]
Whitespace fixes for diary_entry erb files
Andy Allan [Wed, 6 Mar 2019 09:59:55 +0000 (10:59 +0100)]
Whitespace fixes for browse erb files
Andy Allan [Wed, 6 Mar 2019 09:54:13 +0000 (10:54 +0100)]
Whitespace fixes for errors erb files
Andy Allan [Wed, 6 Mar 2019 09:53:57 +0000 (10:53 +0100)]
Whitespace fixes for oauth_clients erb files
Andy Allan [Wed, 6 Mar 2019 09:53:40 +0000 (10:53 +0100)]
Whitespace fixes for issues erb files
Andy Allan [Wed, 6 Mar 2019 09:50:33 +0000 (10:50 +0100)]
Whitespace fixes for users erb files
Andy Allan [Wed, 6 Mar 2019 09:42:25 +0000 (10:42 +0100)]
Whitespace fixes for user_blocks erb files
Andy Allan [Wed, 6 Mar 2019 09:34:54 +0000 (10:34 +0100)]
Whitespace fixes for notifier erb views
Andy Allan [Wed, 6 Mar 2019 09:29:20 +0000 (10:29 +0100)]
Whitespace fixes for site erb files
Andy Allan [Wed, 6 Mar 2019 09:17:44 +0000 (10:17 +0100)]
Whitespace fixes in traces erb files
Tom Hughes [Tue, 26 Mar 2019 19:12:18 +0000 (19:12 +0000)]
Prefer String#match? over butt ugly Regexp#match?
Tom Hughes [Tue, 26 Mar 2019 19:08:36 +0000 (19:08 +0000)]
Target ruby 2.5.1 to match Ubuntu
Andy Allan [Wed, 13 Mar 2019 09:33:33 +0000 (10:33 +0100)]
Rubocop fixes for ruby 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.
Tom Hughes [Tue, 26 Mar 2019 19:14:04 +0000 (19:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2175'
Tom Hughes [Tue, 26 Mar 2019 19:12:18 +0000 (19:12 +0000)]
Prefer String#match? over butt ugly Regexp#match?
Tom Hughes [Tue, 26 Mar 2019 19:08:36 +0000 (19:08 +0000)]
Target ruby 2.5.1 to match Ubuntu
translatewiki.net [Mon, 25 Mar 2019 18:07:09 +0000 (19:07 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 24 Mar 2019 17:08:57 +0000 (17:08 +0000)]
Queue trace related jobs in the traces queue
Tom Hughes [Sat, 23 Mar 2019 12:08:41 +0000 (12:08 +0000)]
Merge remote-tracking branch 'upstream/pull/2131'
Tom Hughes [Sat, 23 Mar 2019 12:01:05 +0000 (12:01 +0000)]
Merge remote-tracking branch 'upstream/pull/2186'
Tom Hughes [Sat, 23 Mar 2019 11:59:42 +0000 (11:59 +0000)]
Use strings consistently for database/api/gpx status
translatewiki.net [Thu, 21 Mar 2019 10:04:08 +0000 (11:04 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 20 Mar 2019 13:51:57 +0000 (14:51 +0100)]
Move more api-only methods into api_controller
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.
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.
Andy Allan [Wed, 20 Mar 2019 13:36:43 +0000 (14:36 +0100)]
Move the authorize method to api_controller
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
Andy Allan [Wed, 20 Mar 2019 13:16:15 +0000 (14:16 +0100)]
Refactor api controllers to inherit from a common ApiController
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
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
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.
Tom Hughes [Tue, 19 Mar 2019 14:08:43 +0000 (14:08 +0000)]
Fix travis
Tom Hughes [Tue, 19 Mar 2019 13:29:49 +0000 (13:29 +0000)]
Merge remote-tracking branch 'upstream/pull/2182'
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.
translatewiki.net [Mon, 18 Mar 2019 07:57:33 +0000 (08:57 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 17 Mar 2019 10:49:21 +0000 (10:49 +0000)]
Move application.yml check to config initializer
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.
Tom Hughes [Sat, 16 Mar 2019 16:52:08 +0000 (16:52 +0000)]
Fix database offline mode
Tom Hughes [Sat, 16 Mar 2019 15:41:35 +0000 (15:41 +0000)]
Sort gitignore
Tom Hughes [Sat, 16 Mar 2019 15:40:23 +0000 (15:40 +0000)]
Add comment
Tom Hughes [Sat, 16 Mar 2019 15:39:03 +0000 (15:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2177'
Tom Hughes [Sat, 16 Mar 2019 15:31:29 +0000 (15:31 +0000)]
Merge remote-tracking branch 'upstream/pull/2164'
Andy Allan [Wed, 13 Mar 2019 11:14:31 +0000 (12:14 +0100)]
Rubocop fix
Andy Allan [Wed, 13 Mar 2019 11:06:19 +0000 (12:06 +0100)]
Rubocop fixes
Andy Allan [Wed, 13 Mar 2019 11:04:54 +0000 (12:04 +0100)]
Move changeset builder views to the api namespace
Frederik Ramm [Fri, 1 Mar 2019 00:11:19 +0000 (01:11 +0100)]
Move changeset XML generation to a view
Tom Hughes [Fri, 15 Mar 2019 10:44:16 +0000 (10:44 +0000)]
Add missing dependency
Tom Hughes [Fri, 15 Mar 2019 10:18:29 +0000 (10:18 +0000)]
Add missing dependencies
Tom Hughes [Fri, 15 Mar 2019 09:30:17 +0000 (09:30 +0000)]
Update to rails 5.2.2.1
Tom Hughes [Fri, 15 Mar 2019 09:27:38 +0000 (09:27 +0000)]
Update bundle
Tom Hughes [Fri, 15 Mar 2019 09:17:28 +0000 (09:17 +0000)]
Add Spanish attribution to copyright page
Fixes #2179
translatewiki.net [Thu, 14 Mar 2019 12:14:50 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 13 Mar 2019 17:41:57 +0000 (18:41 +0100)]
Remove application.yml step from travis config
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
Andy Allan [Wed, 13 Mar 2019 16:57:51 +0000 (17:57 +0100)]
Add some settings validations
Andy Allan [Wed, 13 Mar 2019 16:54:41 +0000 (17:54 +0100)]
Update documentation for new approach to settings
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
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.
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
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
Andy Allan [Wed, 13 Mar 2019 13:05:39 +0000 (14:05 +0100)]
Install config gem for settings management
Andy Allan [Wed, 13 Mar 2019 09:33:33 +0000 (10:33 +0100)]
Rubocop fixes for ruby 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.
translatewiki.net [Mon, 11 Mar 2019 10:29:31 +0000 (11:29 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 8 Mar 2019 11:17:51 +0000 (11:17 +0000)]
Prevent leading and trailing whitespace on email addresses
Tom Hughes [Fri, 8 Mar 2019 10:58:42 +0000 (10:58 +0000)]
Strip leading and trailing whitespace for email authentication
Fixes #2173
translatewiki.net [Thu, 7 Mar 2019 15:23:12 +0000 (16:23 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 6 Mar 2019 17:23:46 +0000 (17:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2167'
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.
Richard Fairhurst [Thu, 28 Feb 2019 21:44:44 +0000 (21:44 +0000)]
Update OS copyright year
Tom Hughes [Thu, 28 Feb 2019 19:17:40 +0000 (19:17 +0000)]
Merge remote-tracking branch 'upstream/pull/2161'
Tom Hughes [Thu, 28 Feb 2019 18:58:05 +0000 (18:58 +0000)]
Merge remote-tracking branch 'upstream/pull/2160'
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
Andy Allan [Sun, 24 Feb 2019 15:06:07 +0000 (16:06 +0100)]
Fix test file name
Andy Allan [Sun, 24 Feb 2019 14:52:20 +0000 (15:52 +0100)]
Move the amf and swf controllers into 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
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
Andy Allan [Sun, 24 Feb 2019 12:37:03 +0000 (13:37 +0100)]
Move node/way/relation/old_* controllers into the api namespace
Quincy Morgan [Tue, 26 Feb 2019 18:52:10 +0000 (13:52 -0500)]
Update to iD v2.14.3
Tom Hughes [Mon, 25 Feb 2019 18:58:19 +0000 (18:58 +0000)]
Flip header image horizontally on RTL pages
Fixes #2158
Tom Hughes [Mon, 25 Feb 2019 18:50:40 +0000 (18:50 +0000)]
Prevent reversal of sprite positions on welcome screen
Fixes #2156
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
translatewiki.net [Mon, 25 Feb 2019 09:54:34 +0000 (10:54 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 24 Feb 2019 22:40:01 +0000 (22:40 +0000)]
Allow loading of our manifest
Andy Allan [Sun, 24 Feb 2019 11:47:26 +0000 (12:47 +0100)]
Move the user preferences controller into the api namespace
Andy Allan [Sun, 24 Feb 2019 11:42:07 +0000 (12:42 +0100)]
Move the search controller to the api namespace