Commit graph

6047 commits

Author SHA1 Message Date
Tom Hughes
ecd81eadbe erblint: use parentheses for nested function calls 2019-03-27 18:55:48 +00:00
Tom Hughes
40141993f7 erblint: use symbols as procs 2019-03-27 18:54:16 +00:00
Tom Hughes
70f571fbcf erblint: avoid negated if conditions 2019-03-27 18:49:01 +00:00
Tom Hughes
7cd7354673 erblint: prefer symbolic logical operators over and/or/not 2019-03-27 18:47:51 +00:00
Tom Hughes
dbbbd62ef1 Merge remote-tracking branch 'upstream/pull/2192' 2019-03-27 18:19:08 +00:00
Andy Allan
7b057545c0 Disentangle the api abilities from the web abilities
This will allow us to rename api actions without causing permissions headaches. The choice of
abilities files is made by inheriting from either api_controller or application_controller.

Also rename capabilities to api_capabilites, for consistency.
2019-03-27 18:07:29 +01:00
Andy Allan
22c1be4db7 Set image dimensions in order to avoid a reflow after the page is drawn by the browser 2019-03-27 18:05:44 +01:00
Andy Allan
a5f4124681 Refactor notes#mine to simplify code 2019-03-27 18:04:44 +01:00
Tom Hughes
3af16f6337 erblint: fix remaining single quoted strings 2019-03-27 16:15:19 +00:00
Tom Hughes
50091893d4 Merge remote-tracking branch 'upstream/pull/2189' 2019-03-27 12:07:11 +00:00
Tom Hughes
3b237dc3da Merge remote-tracking branch 'upstream/pull/2188' 2019-03-27 10:43:23 +00:00
Andy Allan
d5d3975181 Use the trace jobs for creating and destroy traces via the API 2019-03-27 11:40:50 +01:00
Andy Allan
0e09252840 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.
2019-03-27 11:24:31 +01:00
Andy Allan
3834ed45e6 erblint: avoid parentheses for method calls with no arguments 2019-03-27 10:59:10 +01:00
Andy Allan
6d0100b91d erblint: prefer double quoted strings 2019-03-27 10:57:00 +01:00
Andy Allan
74b91c0e3e erblint: Add or remove curly braces around hash parameters as required 2019-03-27 10:30:48 +01:00
Andy Allan
040c0184a4 erblint: use hash rocket syntax 2019-03-27 10:03:56 +01:00
Tom Hughes
4adc6680ee Fix capitalisation of div tag 2019-03-26 20:52:43 +00:00
Andy Allan
4dd0a74a3b Whitespace fixes to various erb files 2019-03-26 20:23:35 +00:00
Andy Allan
c703a3d1a7 Whitespace fixes for messages erb files 2019-03-26 20:23:35 +00:00
Andy Allan
9077419ca8 Whitespace fixes for layouts erb files 2019-03-26 20:23:35 +00:00
Andy Allan
0625c1effb Whitespace fixes for diary_entry erb files 2019-03-26 20:23:35 +00:00
Andy Allan
3c410bcd7e Whitespace fixes for browse erb files 2019-03-26 20:23:35 +00:00
Andy Allan
df49529237 Whitespace fixes for errors erb files 2019-03-26 20:23:35 +00:00
Andy Allan
e3470746bf Whitespace fixes for oauth_clients erb files 2019-03-26 20:23:35 +00:00
Andy Allan
84bdc5d048 Whitespace fixes for issues erb files 2019-03-26 20:23:35 +00:00
Andy Allan
5029db24fa Whitespace fixes for users erb files 2019-03-26 20:23:35 +00:00
Andy Allan
aa9e9a5eb1 Whitespace fixes for user_blocks erb files 2019-03-26 20:23:35 +00:00
Andy Allan
68a5aa5ed8 Whitespace fixes for notifier erb views 2019-03-26 20:23:35 +00:00
Andy Allan
38cfc35eb2 Whitespace fixes for site erb files 2019-03-26 20:23:35 +00:00
Andy Allan
bbd44f8099 Whitespace fixes in traces erb files 2019-03-26 20:23:35 +00:00
Tom Hughes
9afcf14dfa Prefer String#match? over butt ugly Regexp#match? 2019-03-26 20:23:35 +00:00
Andy Allan
773ef195d4 Rubocop fixes for ruby 2.5 2019-03-26 20:23:35 +00:00
Tom Hughes
6e3aaea877 Queue trace related jobs in the traces queue 2019-03-24 17:08:57 +00:00
Tom Hughes
37f8f8a28c Merge remote-tracking branch 'upstream/pull/2131' 2019-03-23 12:08:41 +00:00
Tom Hughes
951564eed1 Merge remote-tracking branch 'upstream/pull/2186' 2019-03-23 12:01:05 +00:00
Tom Hughes
cba7945a5b Use strings consistently for database/api/gpx status 2019-03-23 11:59:42 +00:00
Andy Allan
19c2f6d485 Move more api-only methods into api_controller 2019-03-20 15:08:36 +01:00
Andy Allan
8d207e7de0 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.
2019-03-20 15:08:36 +01:00
Andy Allan
dad36f2fca 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.
2019-03-20 15:08:36 +01:00
Andy Allan
94d19ae567 Move the authorize method to api_controller 2019-03-20 14:39:17 +01:00
Andy Allan
742291a840 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
2019-03-20 14:39:17 +01:00
Andy Allan
3bb07e29ec Refactor api controllers to inherit from a common ApiController 2019-03-20 14:16:15 +01:00
Andy Allan
c1bf73bee4 Use an enumerator for gpx.points, and process the the points in batches 2019-03-20 10:35:40 +01:00
Andy Allan
07fdcf638e Raise exception if there is an error, and import tracepoints in batches 2019-03-20 10:35:40 +01:00
Andy Allan
400db58036 Use activerecord-import for bulk importing tracepoint records
Non-rigourous testing shows a significant speedup, even on ssds.
2019-03-20 10:35:40 +01:00
Tom Hughes
7ccd11ebf3 Merge remote-tracking branch 'upstream/pull/2182' 2019-03-19 13:29:49 +00:00
Michael Reichert
aae6a787e5 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.
2019-03-18 22:39:10 +01:00
Tom Hughes
141df02e67 Move status into the settings object
Only the very early boot code needs to look at the value
from the environment directly.
2019-03-17 11:15:34 +00:00
Tom Hughes
6600221fe3 Fix database offline mode 2019-03-17 11:15:34 +00:00