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

Fix mixup with YAML tags #10287

Merged
merged 2 commits into from
Sep 2, 2023
Merged

Fix mixup with YAML tags #10287

merged 2 commits into from
Sep 2, 2023

Conversation

koppor
Copy link
Member

@koppor koppor commented Sep 2, 2023

Fixes "timeout" in merge queue.

Follow-up to #10282

Mandatory checks

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@koppor koppor marked this pull request as ready for review September 2, 2023 20:34
@koppor
Copy link
Member Author

koppor commented Sep 2, 2023

Code and fix with actions...

@koppor koppor merged commit 5e8a4d5 into main Sep 2, 2023
8 of 11 checks passed
@koppor koppor deleted the koppor-patch-1 branch September 2, 2023 20:34
@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2023

The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build.

Siedlerchr added a commit that referenced this pull request Sep 3, 2023
* upstream/main: (737 commits)
  Use OpenRewrite UseStringReplace (#10299)
  Add ReplaceStringBuilderWithString (#10302)
  Apply ShortenFullyQualifiedTypeReferences (#10301)
  Apply StaticMethodNotFinal (#10300)
  Apply exit early pattern (#10297)
  Avoid GH_TOKEN_UPDATE_GRADLE_WRAPPER at refresh-csl-subtrees
  Update snapcraft.yaml
  Fix exception when opening preferences (#10294)
  gnome-42-2204
  use gnome 4.2
  Use gnome
  Update base 22
  Add method for detecting journal abbrev delimiter (#10281)
  Update bug_report.yml
  Fix selection of table sort order (#10250)
  Fix mixup with YAML tags (#10287)
  More guards for upload (#10282)
  Reduced calls to Globals.prefs and Globals.entryTypesManager (#10177)
  Update jmh plugin (#10279)
  Add computer science to protected terms (#10222)
  ...

# Conflicts:
#	build.gradle
#	src/main/java/module-info.java
#	src/main/java/org/jabref/cli/Launcher.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java
#	src/main/resources/tinylog.properties
Siedlerchr added a commit that referenced this pull request Sep 4, 2023
…ustStore

* upstream/main: (295 commits)
  Use OpenRewrite UseStringReplace (#10299)
  Add ReplaceStringBuilderWithString (#10302)
  Apply ShortenFullyQualifiedTypeReferences (#10301)
  Apply StaticMethodNotFinal (#10300)
  Apply exit early pattern (#10297)
  Avoid GH_TOKEN_UPDATE_GRADLE_WRAPPER at refresh-csl-subtrees
  Update snapcraft.yaml
  Fix exception when opening preferences (#10294)
  gnome-42-2204
  use gnome 4.2
  Use gnome
  Update base 22
  Add method for detecting journal abbrev delimiter (#10281)
  Update bug_report.yml
  Fix selection of table sort order (#10250)
  Fix mixup with YAML tags (#10287)
  More guards for upload (#10282)
  Reduced calls to Globals.prefs and Globals.entryTypesManager (#10177)
  Update jmh plugin (#10279)
  Add computer science to protected terms (#10222)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant