Skip to content

Commit

Permalink
Squashed 'metadata/' changes from 52c1b0a..d47628a
Browse files Browse the repository at this point in the history
d47628a Fix newline
5cc49ac Fix escape and remove wrong entries (#148)
73206c6 Also use " at update scripts (#145)
95894c7 Update automerge.yml (#141)
0273c51 Fix lists - Migrate from semicolon to comma as separator (#139)

git-subtree-dir: metadata
git-subtree-split: d47628aa8ae2d7d47d5b18a82982d2246996347c
  • Loading branch information
zoushucai committed Sep 4, 2023
1 parent 34da585 commit 1b94c5a
Show file tree
Hide file tree
Showing 32 changed files with 227,289 additions and 227,193 deletions.
41 changes: 11 additions & 30 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,17 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
workflow_dispatch:
push:
branches:
- 'add-automerge'
on: [push, pull_request, workflow_dispatch]

permissions:
contents: write
pull-requests: write

jobs:
automerge:
github-actions:
runs-on: ubuntu-latest
if: ${{ github.actor == 'koppor' }}
steps:
- id: automerge
name: automerge
uses: "pascalgn/[email protected]"
- name: Merge PR
run: gh pr merge --auto --squash "$PR_URL"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_FILTER_AUTHOR: "github-actions"
MERGE_METHOD: "merge"
MERGE_LABELS: ""
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -444,3 +444,7 @@ $RECYCLE.BIN/
*.lnk

# End of https://www.toptal.com/developers/gitignore/api/linux,windows,intellij+all,microsoftoffice,latex

# For repo
/*.csv
journals/*.txt
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
abbrv.jabref.org
abbrv.jabref.org
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
theme: jekyll-theme-slate
theme: jekyll-theme-slate
3,478 changes: 1,739 additions & 1,739 deletions journals/journal_abbreviations_acs.csv

Large diffs are not rendered by default.

2,008 changes: 1,004 additions & 1,004 deletions journals/journal_abbreviations_aea.csv

Large diffs are not rendered by default.

5,104 changes: 2,548 additions & 2,556 deletions journals/journal_abbreviations_ams.csv

Large diffs are not rendered by default.

1,696 changes: 848 additions & 848 deletions journals/journal_abbreviations_annee-philologique.csv

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions journals/journal_abbreviations_astronomy.csv
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Acta Astronomica;Acta Astron.
Annual Review of Astronomy and Astrophysics;ARA&A
Astronomische Nachrichten;Astron. Nachrichten
Astronomy and Astrophysics;A&A
Astrophysics and Space Science;Ap&SS
GRB Coordinates Network;NASA-GCN
Journal of Cosmology and Astro-Particle Physics;J. Cosmology & Astro-Part. Phys.
Monthly Notices of the Royal Astronomical Society;MNRAS
Nature;Nat
New Astronomy Review;New Astron. Rev.
Physics Reports;Phys. Rep.
Publications of the Astronomical Society of the Pacific;PASP
Science;Sci
Space Science Reviews;Space Sci. Rev.
The Astronomical Journal;AJ
The Astrophysical Journal;ApJ
The Astrophysical Journal Letters;ApJ
"Acta Astronomica","Acta Astron."
"Annual Review of Astronomy and Astrophysics","ARA&A"
"Astronomische Nachrichten","Astron. Nachrichten"
"Astronomy and Astrophysics","A&A"
"Astrophysics and Space Science","Ap&SS"
"GRB Coordinates Network","NASA-GCN"
"Journal of Cosmology and Astro-Particle Physics","J. Cosmology & Astro-Part. Phys."
"Monthly Notices of the Royal Astronomical Society","MNRAS"
"Nature","Nat"
"New Astronomy Review","New Astron. Rev."
"Physics Reports","Phys. Rep."
"Publications of the Astronomical Society of the Pacific","PASP"
"Science","Sci"
"Space Science Reviews","Space Sci. Rev."
"The Astronomical Journal","AJ"
"The Astrophysical Journal","ApJ"
"The Astrophysical Journal Letters","ApJ"
3,180 changes: 1,590 additions & 1,590 deletions journals/journal_abbreviations_dainst.csv

Large diffs are not rendered by default.

39,012 changes: 19,506 additions & 19,506 deletions journals/journal_abbreviations_entrez.csv

Large diffs are not rendered by default.

3,782 changes: 1,891 additions & 1,891 deletions journals/journal_abbreviations_general.csv

Large diffs are not rendered by default.

Loading

0 comments on commit 1b94c5a

Please sign in to comment.