<p></p>
<p><b>@gravitystorm</b> requested changes on this pull request.</p>
<p dir="auto">Looks good, just one inline question and two other requests:</p>
<ul dir="auto">
<li>From CONTRIBUTING.md - "Avoid including "fixup" commits. If you have added a fixup commit (for example to fix a rubocop warning, or because you changed your own new code) please combine the fixup commit into the commit that introduced the problem. git rebase -i is very useful for this."</li>
<li>Could you please have the changes to the docs as the first commit, and then the addition of the linting as a second commit, that way the CI would pass for either of them.</li>
</ul><hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4286#discussion_r1358286950">.github/workflows/lint.yml</a>:</p>
<pre style='color:#555'>> + - name: Setup ruby
+ uses: ruby/setup-ruby@v1
+ with:
+ ruby-version: ${{ env.ruby }}
+ bundler-cache: true
+ - name: Setup database
+ run: |
+ sudo systemctl start postgresql
+ sudo -u postgres createuser -s $(id -un)
+ createdb openstreetmap
+ cp config/github.database.yml config/database.yml
+ bundle exec rails db:test:load
+ - name: Run Annotate Models
+ run: bundle exec rails annotate_models
+ - name: Fail if model annotations are out of date
+ run: git diff --exit-code app/models/
</pre>
<p dir="auto">Is this restriction necessary? It means we need to change this in future if we annotate factories or routes etc.</p>
<p dir="auto">If we can relax the restriction that's less work for the future.</p>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4286#pullrequestreview-1676540278">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLJL7YRDT6HCQBLN3B3X7FA73ANCNFSM6AAAAAA55ATYY4">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLKHPT7B3SJALZDRLUDX7FA73A5CNFSM6AAAAAA55ATYY6WGG33NNVSW45C7OR4XAZNRKB2WY3CSMVYXKZLTORJGK5TJMV32UY3PNVWWK3TUL5UWJTTD5X4XM.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/4286/review/1676540278</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/4286#pullrequestreview-1676540278",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/4286#pullrequestreview-1676540278",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>