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

Erb lint 0.3 test #190

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .erb-lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
---
EnableDefaultLinters: false
linters:
AllowedScriptType:
enabled: true
ClosingErbTagIndent:
enabled: true
CommentSyntax:
enabled: true
ErbSafety:
enabled: true
ExtraNewline:
Expand All @@ -10,6 +15,10 @@ linters:
enabled: true
NoJavascriptTagHelper:
enabled: true
ParserErrors:
enabled: true
RightTrim:
enabled: true
SelfClosingTag:
enabled: false
SpaceAroundErbTag:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/kanban.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,18 @@ env:
jobs:
assign_one_project:
name: Add new pull requests to the kanban
if: github.repository_owner == 'consul'
runs-on: ubuntu-latest
steps:
- name: Assign new pull requests to the reviewing column
uses: srggrs/[email protected]
if: github.event.pull_request.draft == false
with:
project: "https://github.com/orgs/consul/projects/1"
project: "https://github.com/users/javierm/projects/4"
column_name: "Reviewing"

- name: Assign new draft pull requests to the doing column
uses: srggrs/[email protected]
if: github.event.pull_request.draft == true
with:
project: "https://github.com/orgs/consul/projects/1"
project: "https://github.com/users/javierm/projects/4"
column_name: "Doing"
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ group :development do
gem "capistrano-rails", "~> 1.6.2", require: false
gem "capistrano3-delayed-job", "~> 1.7.6"
gem "capistrano3-puma", "~> 5.2.0"
gem "erb_lint", "~> 0.0.37", require: false
gem "erb_lint", "~> 0.3.0", require: false
gem "mdl", "~> 0.11.0", require: false
gem "pronto", "~> 0.11.0", require: false
gem "pronto-erb_lint", "~> 0.1.5", require: false
gem "pronto-erb_lint", "~> 0.1.6", require: false
gem "pronto-eslint", "~> 0.11.0", require: false
gem "pronto-rubocop", "~> 0.11.2", require: false
gem "pronto-scss", "~> 0.11.0", require: false
Expand Down
23 changes: 10 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,11 @@ GEM
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bcrypt (3.1.18)
better_html (1.0.16)
actionview (>= 4.0)
activesupport (>= 4.0)
better_html (2.0.1)
actionview (>= 6.0)
activesupport (>= 6.0)
ast (~> 2.0)
erubi (~> 1.4)
html_tokenizer (~> 0.0.6)
parser (>= 2.4)
smart_properties
bindex (0.8.1)
Expand Down Expand Up @@ -184,10 +183,9 @@ GEM
htmlentities (~> 4.3.3)
launchy (~> 2.1)
mail (~> 2.7)
erb_lint (0.0.37)
erb_lint (0.3.1)
activesupport
better_html (~> 1.0.7)
html_tokenizer
better_html (>= 2.0.1)
parser (>= 2.7.1.4)
rainbow
rubocop
Expand Down Expand Up @@ -266,7 +264,6 @@ GEM
rexml (~> 3.0)
hashie (5.0.0)
highline (2.0.3)
html_tokenizer (0.0.7)
htmlentities (4.3.4)
httparty (0.21.0)
mini_mime (>= 1.0.0)
Expand Down Expand Up @@ -420,9 +417,9 @@ GEM
rexml (~> 3.2)
rugged (>= 0.23.0, < 1.1.0)
thor (>= 0.20.3, < 2.0)
pronto-erb_lint (0.1.5)
erb_lint (~> 0.0.24)
pronto (> 0.9.0)
pronto-erb_lint (0.1.6)
erb_lint (~> 0.1, >= 0.1.1)
pronto (~> 0.9, > 0.9.0)
pronto-eslint (0.11.0)
eslintrb (~> 2.0, >= 2.0.0)
pronto (~> 0.11.0)
Expand Down Expand Up @@ -695,7 +692,7 @@ DEPENDENCIES
devise (~> 4.8.1)
devise-security (~> 0.16.0)
email_spec (~> 2.2.0)
erb_lint (~> 0.0.37)
erb_lint (~> 0.3.0)
factory_bot_rails (~> 6.2.0)
faker (~> 2.22.0)
file_validators (~> 3.0.0)
Expand Down Expand Up @@ -729,7 +726,7 @@ DEPENDENCIES
pg (~> 1.4.3)
pg_search (~> 2.3.6)
pronto (~> 0.11.0)
pronto-erb_lint (~> 0.1.5)
pronto-erb_lint (~> 0.1.6)
pronto-eslint (~> 0.11.0)
pronto-rubocop (~> 0.11.2)
pronto-scss (~> 0.11.0)
Expand Down
2 changes: 1 addition & 1 deletion app/views/dashboard/poster/index.pdf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<%= wicked_pdf_stylesheet_link_tag "dashboard_poster" -%>
<%= wicked_pdf_stylesheet_link_tag "dashboard_poster" =%>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use 1 space before %> instead of 0 space.

<%= wicked_pdf_stylesheet_link_tag "pdf_fonts" -%>
</head>
<body class="dashboard-poster-pdf">
Expand Down
1 change: 1 addition & 0 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<%= raw setting["html.per_page_code_head"] %>
</head>
<% # TODO %>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad ERB comment syntax. Should be <%# without a space between.
Leaving a space between ERB tags and the Ruby comment character can cause parser errors.

<body class="<%= yield(:body_class) %> public">
<%= raw setting["html.per_page_code_body"] %>

Expand Down