Skip to content

Commit

Permalink
Merge branch 'release/0.41.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
gbp committed Jul 5, 2022
2 parents 3975295 + 1e2a175 commit 55bdd3a
Show file tree
Hide file tree
Showing 533 changed files with 13,376 additions and 3,297 deletions.
48 changes: 48 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
# Remove commits converting files to 2-spaces
e9074d60ea28f9fb98e82be4fe15d0de5d637eff
3fbd060cea72f717df8b0651a69c79f4fdd509f8
81c0cf2d2eb2dcccbdbad9dc8937793dc244424b
3fb4bade8546052f69f68311ff3b5eb530bdce06
137cb672f1532f916239969756f2392337f1c8df
4eee188e093bc8bf3782ec4bd14c3529b0b01586
e58feafc6ab8a9b6d51946c55cde6adae9116568
390c000ab8f3dd081db7feced594a3798cdf2147
83429e1295b90e684cd67108737d6dabf80ae883
c58f6013d9c374664dffbfa645fb8fed60d335d8
5dec2b34f0512dadc470a8d006e46d260881a2ca
423a748e925c0e196a540197594f289f8a948648
f2dc73ce4e676a390205bafd6732a217f3de3c89
0b498ff3b0fe95496d90fd63be718e895a24537c
ec07eae1d3e4ce65cad2d5cbe5221a89e06e45af
423ef61c3df718df6bb2a9b0dbf5d5c7180230cd
9202518ad9018182680fca33902d63a825c3fe16
cefe07dee896adb7aa542601b3f7cc75f990df6c
953b9e225b2029d75d8f864d7a038aeb0860b32d
7fbd7299e238e41cc341bc3e6d65ed757d4e870a
9e556bcfa67c6cb4843c5b5398c96f84c4639708
0da7b93c5f6e3ebff376e5b5dd01c9f03ec1c2c8
19a3591d6246dc3af866982a1fe8d6d609d8514b
bb60b2632117e692f933810dbf321f22d27604fd
38da000ae7b6d11c620f28866715922ef980360b
92563edca5d7552235c9dd069aabc375be9c5b74
872dd47ca574ed8b06597e49be4d21712e8a6a0b
b5caf1f17165c597b00020805c909b1eb8907e97
844453b95c497b810fc27005ce376a90ea754fa9
c85fd8205c2f5eab598de9a14d1acda4f3380992
b805700e3e632be1dcbea4d96a667722129d2c2b
30681a0a22b49dfff2af6139472757dce3d2c040
cf020f3bce0dc6525b6a8a45258ddb55448be17c
db492303b1d2a22de4be039cde0961c48761d7ce
f07280eeb98f6058b75a3ca94afb73254c7963c7
d35e92ba521b1183bf644e03aad8bbea721d9894
ce8b44f8669b276767e03965865e4b8411e0abd3
4be25b1ca7754f8b2ad2aef8b1010911d1705dc6
8d0a624458733bb6b84c9185e3cc6dd087fbe087
b0aac8fc3d038553ca13fdd9cae3a85ae6a2a6d8
b80cc391530136d6178f0539100aef7c78a63a63
da75289f3414b498f0708b24bbdfc09864fe2da5
29aeb19078f68e72ac781fbe27607a744d2b712a
6691f97656f1aff03b3da8cdf42c94eb05d9fc07
0b4059b3f3a4898526b7c31d5f4db6429b9a26ef
f2c538c1a25d91de33dd583a5ee34e433ffaa8a6
26 changes: 26 additions & 0 deletions .github/git-io-urls.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# git.io URL shortener URLs

GitHub [announced it was shutting down git.io](https://github.blog/changelog/2022-04-25-git-io-deprecation)
on Friday, April 29, 2022 and as a consequence all links on
[git.io](https://git.io) will stop redirecting.

We've replaced these URLs in the source code and GitHub issues where possible.

## Commit Messages

Commit messages can't be changed, so this table acts as a manual lookup for
git.io URLs known to be included in commits in Alaveteli.

```csv
https://git.io/JvMcI,https://github.com/rails/rails/blob/v5.1.7/actionview/lib/action_view/helpers/javascript_helper.rb#L25-L32
https://git.io/JvMcL,https://github.com/rails/rails/blob/v5.2.4.1/actionview/lib/action_view/helpers/javascript_helper.rb#L27-L34
https://git.io/JvMcm,https://github.com/rails/rails/commit/b5aeef5703dab7da9ebb47cc20e4c8b64f7f5866
https://git.io/hR7f,https://github.com/alexdunae/holidays/blob/master/CHANGELOG.md#120
https://git.io/v0QN2,https://github.com/holidays/holidays/blob/master/CHANGELOG.md#220
https://git.io/v6otV,https://github.com/svenfuchs/routing-filter/issues/47#issue-14760397
https://git.io/vKpwO,https://github.com/rails/rails/commit/5f189f41258b83d49012ec5a0678d827327e7543
https://git.io/vozPG,https://github.com/mikel/mail/blob/a217776355befa3d8191c4bd3c1fad54e0e27471/lib/mail/version_specific/ruby_1_9.rb#L89
https://git.io/vun4e,https://github.com/travis-ci/travis-ci/issues/1242#issuecomment-21660547
https://git.io/vvv93,https://github.com/mysociety/alaveteli/blob/8c72a2590a6c0a5f21491b96f44eeb8da53663bd/spec/integration/admin_public_body_edit_spec.rb#L48
https://git.io/vvv9t,https://github.com/mysociety/alaveteli/blob/8c72a2590a6c0a5f21491b96f44eeb8da53663bd/spec/integration/admin_public_body_edit_spec.rb#L42-L70
```
30 changes: 22 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,31 @@ on:
branches: [master, develop]
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

permissions:
contents: read

jobs:
rspec:
name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile || 'Gemfile' }}
name: Ruby ${{ matrix.ruby }} / PostgreSQL ${{ matrix.postgres }} / ${{ matrix.gemfile || 'Gemfile' }}
runs-on: ubuntu-20.04

permissions:
checks: write # for coverallsapp/github-action to create new checks

strategy:
fail-fast: false
matrix:
include:
- { ruby: 2.5 }
- { ruby: 2.6 }
- { ruby: 2.7 }
- { ruby: 2.7, gemfile: 'Gemfile.rails_next' }
- { ruby: 2.7, postgres: 13.5 }
- { ruby: 2.7, postgres: 13.5, gemfile: 'Gemfile.rails_next' }

services:
postgres:
image: fixmystreet/postgres:latest
image: fixmystreet/postgres:${{ matrix.postgres }}
env:
POSTGRES_PASSWORD: postgres
ports:
Expand All @@ -42,6 +50,7 @@ jobs:
uses: actions/checkout@v2
with:
submodules: true
fetch-depth: 0

- name: Install packages
env:
Expand All @@ -55,7 +64,6 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: ${{ matrix.bundler || '2.1.4' }}
bundler-cache: true

- name: Setup database
Expand All @@ -66,9 +74,13 @@ jobs:
CREATE DATABASE alaveteli_test TEMPLATE template_utf8;
EOSQL
- name: Install theme
- name: Configure application and storage
run: |
cp config/general.yml-example config/general.yml
cp config/storage.yml-example config/storage.yml
- name: Install theme
run: |
bundle exec rake themes:install
- name: Migrate database
Expand All @@ -88,6 +100,8 @@ jobs:
parallel: true

coveralls:
permissions:
checks: write
name: Coveralls
needs: rspec
runs-on: ubuntu-20.04
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: RuboCop

on: [pull_request]

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-20.04
Expand All @@ -11,7 +14,7 @@ jobs:
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 2.7

- name: Run RuboCop linter
uses: reviewdog/action-rubocop@v1
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
/config/memcached.yml
/config/newrelic.yml
/config/rails_env.rb
/config/storage.yml
/config/user_spam_scorer.yml
/config/xapian.yml
/coverage/
Expand All @@ -39,6 +40,7 @@
/public/foi-user-use.png
/public/google*.html
/public/wordpress
/storage/
/tmp/
/vendor/bundle/
/vendor/data/
Loading

0 comments on commit 55bdd3a

Please sign in to comment.