Skip to content

Commit

Permalink
Merge branch 'master' into search-overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
janfaracik committed Jul 6, 2022
2 parents 494f551 + 644a261 commit fba08e7
Show file tree
Hide file tree
Showing 5,811 changed files with 26,714 additions and 24,259 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*.json text
*.jelly text
*.jellytag text
*.less text
# JENKINS-68887: postcss-less fails to properly parse .less files with Windows line breaks
*.less text eol=lf
*.properties text
*.rb text
*.sh text
Expand Down
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ N/A
* Fill-in the `Proposed changelog entries` section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
- [ ] Appropriate autotests or explanation to why this change has no tests
- [ ] New public classes, fields, and methods are annotated with `@Restricted` or have `@since TODO` Javadoc, as appropriate.
- [ ] New deprecations are annotated with `@Deprecated(since = "TODO")` or `@Deprecated(forRemoval = true, since = "TODO")` if applicable.
- [ ] For dependency updates: links to external changelogs and, if possible, full diffs

<!-- For new API and extension points: Link to the reference implementation in open-source (or example in Javadoc) -->
Expand Down
14 changes: 10 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ updates:
# Fails test automation; needs further investigation.
- dependency-name: "com.google.inject:guice-bom"

# Requires Java 11 starting with version 10.0.
- dependency-name: "com.puppycrawl.tools:checkstyle"
versions: [">=10.0"]

# Contains incompatible API changes and needs compatibility work.
- dependency-name: "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"

Expand All @@ -63,3 +59,13 @@ updates:
# Contains incompatible API changes and needs compatibility work. See:
# https://github.com/jenkinsci/jenkins/pull/4224
- dependency-name: "org.jfree:jfreechart"
- package-ecosystem: "npm"
directory: "/war"
schedule:
interval: "daily"
reviewers:
- jenkinsci/sig-ux
ignore:
# Handlebars files (*.hbs) require a few tweaks in order to comply with 4.x' standards:
# https://issues.jenkins.io/browse/JENKINS-68926
- dependency-name: "handlebars"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ work
/.idea/*
!/.idea/icon.svg
!/.idea/.name
!/.idea/encodings.xml
out

# Eclipse and VSCode project files
Expand Down
27 changes: 27 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
tasks:
- init: |
mvn -am -pl war,bom -P quick-build clean install
command: |
mvn -pl war jetty:run -Dhost=0.0.0.0
name: Run
- command: gp await-port 8080 && gp url 8080 && gp preview $(gp url 8080)/jenkins/
name: Preview

github:
prebuilds:
pullRequestsFromForks: true
addBadge: true

jetbrains:
intellij:
plugins:
- Stapler plugin for IntelliJ IDEA
prebuilds:
version: stable

vscode:
extensions:
- vscjava.vscode-java-pack

image:
file: .gitpod/Dockerfile
4 changes: 4 additions & 0 deletions .gitpod/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM gitpod/workspace-full

RUN brew install gh && \
bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && sdk install maven 3.8.4 && sdk default maven 3.8.4"
33 changes: 33 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fba08e7

Please sign in to comment.