Tom Hughes
0c79686f3c
Merge remote-tracking branch 'upstream/pull/2190'
2019-03-28 08:24:04 +00:00
Tom Hughes
7ce40eeb38
erblint: use consistent spacing in HTML tags
2019-03-28 00:30:48 +00:00
Tom Hughes
49da87fb6d
erblint: remove leading blank lines
2019-03-28 00:29:04 +00:00
Tom Hughes
89341ce266
erblint: avoid dynamic find_by methods
2019-03-27 19:14:16 +00:00
Tom Hughes
9f931ca1e3
erblint: add rel=noopener to links that open in a new tab
2019-03-27 19:11:49 +00:00
Tom Hughes
1d97fd25b7
erblint: use conditional assignment
2019-03-27 18:59:52 +00:00
Tom Hughes
6afa132b84
erblint: use word arrays
2019-03-27 18:57:04 +00:00
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
Tom Hughes
69b952ae78
Merge remote-tracking branch 'upstream/pull/2191'
2019-03-27 18:10:09 +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
Andy Allan
c44d689b31
Use trace jobs by default
2019-03-27 11:50:45 +01: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
Tom Hughes
cebb05a3ba
Merge remote-tracking branch 'upstream/pull/2187'
2019-03-27 10:38:46 +00: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
e22266f8c4
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.
2019-03-27 10:42:16 +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
c82fdf8e0f
Merge remote-tracking branch 'upstream/pull/2168'
2019-03-26 21:11:51 +00:00
Tom Hughes
71c5cb21c5
Exclude files in the vendor directory from erb-lint rubocop checks
2019-03-26 20:52:43 +00:00
Tom Hughes
4adc6680ee
Fix capitalisation of div tag
2019-03-26 20:52:43 +00:00
Andy Allan
227e1b134d
Update coding style section of the contribution guide to describe our use of rubocop and erblint
2019-03-26 20:52:43 +00:00
Andy Allan
ce8c388deb
Add erblint to travis
2019-03-26 20:52:43 +00:00
Andy Allan
d6a2515cb0
Introduce erb-lint for linting erb files
...
This also allows running rubocop on the ruby code within the erb
files.
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
Tom Hughes
5a5aa5f880
Target ruby 2.5.1 to match Ubuntu
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
