Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master -> production #320

Merged
merged 28 commits into from
Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b7f3794
Add route for public signs
trevh-ack Apr 26, 2020
3f56035
Add controller for public signs (index only)
trevh-ack Apr 26, 2020
38b4b85
Add public sign service
trevh-ack Apr 26, 2020
8983030
Add sql for public signs
trevh-ack Apr 26, 2020
610b78d
Add view (index template) for public signs
trevh-ack Apr 26, 2020
a718463
From home page link to public signs
trevh-ack Apr 26, 2020
a933cf7
Spec update
trevh-ack Apr 26, 2020
379b618
Spec for public signs service
trevh-ack Apr 27, 2020
5f7113a
Merge pull request #317 from ackama/feature/ncg-286-all-signs
trevh-ack May 11, 2020
7d6f6cc
Update rails due to security vulnerabilities
May 20, 2020
cf31d39
Merge pull request #319 from ackama/security-updates-CVE-2020-8162-CV…
CaraHill May 20, 2020
2d5c077
chore: replace `sass-lint` with `stylelint`
G-Rath Apr 8, 2020
5193135
chore: run `yarn upgrade`
G-Rath Apr 9, 2020
c0ab72b
ci: remove yarn integrity check
G-Rath Apr 9, 2020
c2b130d
chore: update `webdrivers`
G-Rath Jun 1, 2020
c5bad90
chore: update `kaminari`
G-Rath Jun 2, 2020
503ab4a
chore: update `puma`
G-Rath Jun 2, 2020
f38d1e0
Handle request for asset manifest
joshmcarthur Jun 7, 2020
737c2a7
Update rubocop to 0.85
joshmcarthur Jun 7, 2020
6c9ff56
Automated rubocop fixes for 0.85
joshmcarthur Jun 7, 2020
64a3ca7
chore: update `websocket-extensions`
G-Rath Jun 7, 2020
7c14354
chore: run `yarn upgrade`
G-Rath Jun 7, 2020
23fa1cd
Order routes correctly so that asset-manifest.json route comes before…
joshmcarthur Jun 8, 2020
6e5bca4
Merge branch 'security-updates' of gh:ackama/nzsl-share into security…
joshmcarthur Jun 8, 2020
6d22b3b
Merge pull request #314 from ackama/security-updates
joshmcarthur Jun 8, 2020
71c9f93
chore: upgrade lighthouse
G-Rath Jun 8, 2020
657d0c2
Update headings to be in descending order to resolve new accessibilit…
joshmcarthur Jun 9, 2020
c6380f5
Merge pull request #324 from ackama/upgrade-lighthouse
joshmcarthur Jun 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,55 @@ Style/FormatStringToken:
Lint/AmbiguousBlockAssociation:
Exclude:
- "spec/**/*"

# https://www.rubydoc.info/gems/rubocop/0.37.0/RuboCop/Cop/Performance/HashEachMethods
Style/HashEachMethods:
Enabled: true

# https://rubocop.readthedocs.io/en/latest/cops_style/
Style/HashTransformKeys:
Enabled: false

# https://rubocop.readthedocs.io/en/latest/cops_style/
Style/HashTransformValues:
Enabled: false

# https://rubocop.readthedocs.io/en/latest/cops_lint/#lintraiseexception
Lint/RaiseException:
Enabled: true

# https://rubocop.readthedocs.io/en/latest/cops_lint/#lintstructnewoverride
Lint/StructNewOverride:
Enabled: true

# https://docs.rubocop.org/en/latest/cops_layout/#layoutspacearoundmethodcalloperator
Layout/SpaceAroundMethodCallOperator:
Enabled: true

# https://docs.rubocop.org/en/latest/cops_style/#styleexponentialnotation
Style/ExponentialNotation:
Enabled: true

# https://docs.rubocop.org/en/stable/cops_layout/#layoutemptylinesaroundattributeaccessor
Layout/EmptyLinesAroundAttributeAccessor:
Enabled: true

# https://docs.rubocop.org/en/latest/cops_style/#styleslicingwithrange
Style/SlicingWithRange:
Enabled: true

# https://docs.rubocop.org/rubocop/cops_lint.html#lintdeprecatedopensslconstant
Lint/DeprecatedOpenSSLConstant:
Enabled: true

# https://docs.rubocop.org/rubocop/cops_lint.html#lintmixedregexpcapturetypes
Lint/MixedRegexpCaptureTypes:
Enabled: true

# https://docs.rubocop.org/rubocop/cops_style.html#styleredundantregexpcharacterclass
Style/RedundantRegexpCharacterClass:
Enabled: true

# https://docs.rubocop.org/rubocop/cops_style.html#styleredundantregexpescape
Style/RedundantRegexpEscape:
Enabled: true
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Metrics/ClassLength:
Exclude:
- "spec/**/*"

Metrics/LineLength:
Layout/LineLength:
Exclude:
- "config/**/*"
- "db/**/*"
Expand Down
6 changes: 6 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# this file uses .gitignore syntax
node_modules/
coverage/
public/
vendor/
tmp/
7 changes: 7 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
plugins: ['stylelint-scss'],
extends: ['stylelint-config-recommended-scss'],
rules: {
'no-descending-specificity': null
}
};
160 changes: 82 additions & 78 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,61 +3,61 @@ GEM
specs:
aasm (5.0.6)
concurrent-ruby (~> 1.0)
actioncable (6.0.2.2)
actionpack (= 6.0.2.2)
actioncable (6.0.3.1)
actionpack (= 6.0.3.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.2.2)
actionpack (= 6.0.2.2)
activejob (= 6.0.2.2)
activerecord (= 6.0.2.2)
activestorage (= 6.0.2.2)
activesupport (= 6.0.2.2)
actionmailbox (6.0.3.1)
actionpack (= 6.0.3.1)
activejob (= 6.0.3.1)
activerecord (= 6.0.3.1)
activestorage (= 6.0.3.1)
activesupport (= 6.0.3.1)
mail (>= 2.7.1)
actionmailer (6.0.2.2)
actionpack (= 6.0.2.2)
actionview (= 6.0.2.2)
activejob (= 6.0.2.2)
actionmailer (6.0.3.1)
actionpack (= 6.0.3.1)
actionview (= 6.0.3.1)
activejob (= 6.0.3.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.2.2)
actionview (= 6.0.2.2)
activesupport (= 6.0.2.2)
actionpack (6.0.3.1)
actionview (= 6.0.3.1)
activesupport (= 6.0.3.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.2.2)
actionpack (= 6.0.2.2)
activerecord (= 6.0.2.2)
activestorage (= 6.0.2.2)
activesupport (= 6.0.2.2)
actiontext (6.0.3.1)
actionpack (= 6.0.3.1)
activerecord (= 6.0.3.1)
activestorage (= 6.0.3.1)
activesupport (= 6.0.3.1)
nokogiri (>= 1.8.5)
actionview (6.0.2.2)
activesupport (= 6.0.2.2)
actionview (6.0.3.1)
activesupport (= 6.0.3.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.2.2)
activesupport (= 6.0.2.2)
activejob (6.0.3.1)
activesupport (= 6.0.3.1)
globalid (>= 0.3.6)
activemodel (6.0.2.2)
activesupport (= 6.0.2.2)
activerecord (6.0.2.2)
activemodel (= 6.0.2.2)
activesupport (= 6.0.2.2)
activestorage (6.0.2.2)
actionpack (= 6.0.2.2)
activejob (= 6.0.2.2)
activerecord (= 6.0.2.2)
activemodel (6.0.3.1)
activesupport (= 6.0.3.1)
activerecord (6.0.3.1)
activemodel (= 6.0.3.1)
activesupport (= 6.0.3.1)
activestorage (6.0.3.1)
actionpack (= 6.0.3.1)
activejob (= 6.0.3.1)
activerecord (= 6.0.3.1)
marcel (~> 0.3.1)
activesupport (6.0.2.2)
activesupport (6.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
administrate (0.13.0)
Expand Down Expand Up @@ -168,25 +168,24 @@ GEM
inline_svg (1.5.2)
activesupport (>= 3.0)
nokogiri (>= 1.6)
jaro_winkler (1.5.3)
jmespath (1.3.1)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.3.0)
kaminari (1.1.1)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.7.0)
Expand All @@ -196,7 +195,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.4.0)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -207,11 +206,11 @@ GEM
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mimemagic (0.3.4)
mimemagic (0.3.5)
mini_magick (4.9.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.0)
minitest (5.14.1)
mock_redis (0.21.0)
momentjs-rails (2.20.1)
railties (>= 3.1)
Expand All @@ -225,8 +224,8 @@ GEM
overcommit (0.49.1)
childprocess (>= 0.6.3, < 2.0)
iniparse (~> 1.4)
parallel (1.17.0)
parser (2.6.3.0)
parallel (1.19.1)
parser (2.7.1.3)
ast (~> 2.4.0)
pg (1.1.4)
pry (0.12.2)
Expand All @@ -235,7 +234,7 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (3.1.1)
puma (4.3.3)
puma (4.3.5)
nio4r (~> 2.0)
pundit (2.1.0)
activesupport (>= 3.0.0)
Expand All @@ -249,29 +248,29 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.2.2)
actioncable (= 6.0.2.2)
actionmailbox (= 6.0.2.2)
actionmailer (= 6.0.2.2)
actionpack (= 6.0.2.2)
actiontext (= 6.0.2.2)
actionview (= 6.0.2.2)
activejob (= 6.0.2.2)
activemodel (= 6.0.2.2)
activerecord (= 6.0.2.2)
activestorage (= 6.0.2.2)
activesupport (= 6.0.2.2)
rails (6.0.3.1)
actioncable (= 6.0.3.1)
actionmailbox (= 6.0.3.1)
actionmailer (= 6.0.3.1)
actionpack (= 6.0.3.1)
actiontext (= 6.0.3.1)
actionview (= 6.0.3.1)
activejob (= 6.0.3.1)
activemodel (= 6.0.3.1)
activerecord (= 6.0.3.1)
activestorage (= 6.0.3.1)
activesupport (= 6.0.3.1)
bundler (>= 1.3.0)
railties (= 6.0.2.2)
railties (= 6.0.3.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.2.2)
actionpack (= 6.0.2.2)
activesupport (= 6.0.2.2)
railties (6.0.3.1)
actionpack (= 6.0.3.1)
activesupport (= 6.0.3.1)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
Expand All @@ -286,10 +285,11 @@ GEM
rb-inotify (0.10.0)
ffi (~> 1.0)
redis (4.1.2)
regexp_parser (1.6.0)
regexp_parser (1.7.1)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.4)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
Expand All @@ -307,14 +307,18 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
rubocop (0.85.1)
parallel (~> 1.10)
parser (>= 2.6)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.0.3)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-performance (1.4.1)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.0.3)
parser (>= 2.7.0.1)
rubocop-performance (1.6.1)
rubocop (>= 0.71.0)
rubocop-rails (2.3.0)
rack (>= 1.1)
Expand All @@ -323,7 +327,7 @@ GEM
ruby-vips (2.0.16)
ffi (~> 1.9)
ruby_dep (1.5.0)
rubyzip (2.2.0)
rubyzip (2.3.0)
sassc (2.1.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
Expand Down Expand Up @@ -361,17 +365,17 @@ GEM
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
unicode-display_width (1.7.0)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.8)
rack (>= 2.0.6)
webdrivers (4.2.0)
webdrivers (4.4.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (>= 3.0, < 4.0)
Expand All @@ -381,7 +385,7 @@ GEM
railties (>= 4.2)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.3.0)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/administrate/base/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ thead {
}

tr {
border-bottom: $base-border !important; //sass-lint:disable-line no-important
border-bottom: $base-border !important;
}

tbody {
Expand Down
5 changes: 0 additions & 5 deletions app/assets/stylesheets/administrate/components/_search.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

$_search-icon-size: 1rem;

.search {
Expand Down Expand Up @@ -49,7 +48,3 @@ $_search-icon-size: 1rem;
}
}
}