summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1425 from srp-gmbh/jenkins_access_tokenFlorian Zschocke2022-12-091-1/+5
|\ | | | | Add support for Jenkins Git plugin access token, fixes #1423
| * Add support for Jenkins access token fixes #1423Tino Desjardins2022-09-031-1/+5
| |
* | Adjust path after moving from "gitblit" to "gitblit-org" on GithubFlorian Zschocke2022-12-0919-37/+36
| |
* | fix: Fix broken pushes to ticketsFlorian Zschocke2022-12-073-8/+10
| | | | | | | | | | | | | | The update of JGit broke pushes to tickets. The ReceiveCommand now requires all three arguments, oldId, newId and name, to be not null. The ticket code handling pushes to tickets left name and old id as null in certain cases. This is fixed by always providing values.
* | fix: Fix incorrect text being copied by copy button on tickets pageFlorian Zschocke2022-12-061-1/+1
| | | | | | | | The merge step for using `pt` added the wrong text to the copy button.
* | Add french version of Empty Repository pageFlorian Zschocke2022-12-051-0/+60
| | | | | | | | Donated by @piradix
* | fix: Fix broken _de language fileFlorian Zschocke2022-12-051-2/+2
| | | | | | | | | | This fixes incorrect encodings in the _de language file which makes the pages crash.
* | fix: Correct misaligned images in primary repository URL displayFlorian Zschocke2022-12-051-2/+2
| | | | | | | | | | | | Adding style element `max-width:inherit` as suggested by @piradix, which makes the access restriction icon be part of the URL box again. This fixes #1437
* | Merge branch 'clipboardjs' into masterFlorian Zschocke2022-12-0312-50/+308
|\ \ | | | | | | | | | This replaces clippy.sfw with Javascript for issue #1241
| * | Remove clippy.swf and update documentationFlorian Zschocke2022-12-033-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | The `clippy.swf` Flash program is no longer needed and can be deleted. The configuration property is now incorrectly named, but we keep the name and update the documentation. Maybe it could be completely deleted one day, when the clipboard.js solution is known to work and be universally supported.
| * | Replace SWF clippy with clipboard.js on ticket pageFlorian Zschocke2022-12-032-19/+12
| | | | | | | | | | | | | | | The ticket page also has some copy-to-clipboard buttons, which get updated to work with JS instead of SWF.
| * | Add a "Copied" tooltip to the copy-to-clipboard buttonFlorian Zschocke2022-12-035-12/+256
| | | | | | | | | | | | | | | | | | | | | This is not the ideal version, since the height is too low for the tooltip used for the drop-down menus. Probably has something to do with the container or something. But at least something is there now, even if not the most beautiful.
| * | Replace SWF clippy with clipboardjs on repository pageFlorian Zschocke2022-11-204-25/+35
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shockwave Flash is dead. But Gitblit still uses it to copy the repository URLs to the clip board. Which doesn't work anymore since no browser uses Flash anymore, so this has degraded disgracefully. Instead, we can use JavaScript to copy directly to the clipboard, now that there are APIs for it. So replace the use of clippy.swf on the repository page with clipboard.js[1]. This right now only has the functionality to copy to clipboard but now visual feedback, yet. This addresses GH issue #1241. [1] https://clipboardjs.com
* | Fix issue with not serialisable ed25519 SSH keysFlorian Zschocke2022-11-162-1/+32
| | | | | | | | | | | | | | | | | | Adding Ed25519 keys brings the problem that with the library currently used, the PublicKey instance of that key is not serialisable. This results in an exception when wicket tries to cache the UsersPage. So change the SshKeysPanel so that the PublicKey object is removed from the `SshKey` when the panel is detached. It can be regenerated from the raw key data.
* | deps: Update various dependencies that had known CVEsFlorian Zschocke2022-11-144-65/+57
| |
* | deps: Update Jetty to version 9.4.49.v20220914Florian Zschocke2022-11-134-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates Jetty to the latest 9.x version as of writing. The 9.x is still running on Java 8. The update needs two code changes. `SessionManager` was replaced with `SessionHandler`. This was documented in the Jetty documentation. Adding the `GitblitContext` to the `WebAppContext` will result in two instances getting created, because the code was changed that prevents instantiation the same listener class multiple times. (The second time is when the web.xml is read.) Instead, it must be added to the servlet handler of the `WebAppContext`. This results in properly adhering to the changed internal startup flow. Updating Jetty also resolves #1409.
* | fix: Fix jetty crashing when redirecting HTTP to HTTPSFlorian Zschocke2022-11-111-1/+1
| | | | | | | | | | | | | | | | | | Jetty 9.3 changed the `setHandler` on the ServletContextHandler to no longer automatically detect SecurityHandler, SessionHandler, etc. It simply passes on the setHandler request to the ContextHandler class (with a warning logged). So make sure to explicitly use the method `setSecurityHandler` to set the ContraintSecurityHandler responsible for the http -> https redirection.
* | Merge branch 'jvanhercke-jgit-default-charset' into masterFlorian Zschocke2022-11-116-76/+79
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This branch mostly records the commit from PR #1253, so we have it in the code base. The changes are immediately undone, because the update to JGit version 4.8.0, as proposed in PR #1252, renders the whole patching of JGit obsolete. The update is done now, against reservations in that PR, because we guess that potential issues have been found and fixed by now. JGit is updated to the last version on the major version 4 line: 4.11.9. Also, since upstream JGit is at v6 by now, more updates will have to happen later on anyways. To make the protection against illegal character sets complete, an additional fix for Bugtraq is included, that protects against exceptions from bugtraq should it encounter an `encoding` that cannot be handled.
| * | deps: Update JGit to 4.11.9.201909030838-r and other dependenciesFlorian Zschocke2022-11-113-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | Update JGit, and also update other dependencies where the 4.11 JGit version uses newer versions than we do: commond-codec updated to 1.9 commons-compress updated to 1.15 gson updated to 2.8.2
| * | bugtraq: Catch exceptions from bugtraq and show messageFlorian Zschocke2022-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | Catch all exceptions, and not just IOExceptions, from bugtraq formatter. If an exception is caught, ignore the bugtraq handling of the commit message and show the plain message. Way better then not showing anything just because something broke in bugtraq.
| * | bugtraq: Fallback to UTF-8 if commit encoding is unsupportedFlorian Zschocke2022-11-111-1/+15
| | | | | | | | | | | | | | | | | | | | | Reading the encoding of a commit can result in a Unsupported- or IllegalCharsetException. This happens when for whatever reason the commit has an encoding recorded that the system doesn't understand. Instead of completely failing, fallback to UTF-8.
| * | deps: Update JGit to version 4.8.0.201706111038-rFlorian Zschocke2022-11-113-13/+18
| | |
| * | Remove workaround for JGit crashing on 'utf-9' etcFlorian Zschocke2022-11-112-159/+0
| | | | | | | | | | | | | | | | | | | | | Updating JGit fixed the issue that a commit in a repo with an unknown character set throws an exception. This would crash the RepositoryManager. The extra handling, which patches JGit classes during runtime is completely removed.
| * | Add wrapper class to return a default encodingJan Vanhercke2022-11-092-2/+145
|/ / | | | | | | | | Unknown encodings may cause gitblit to fail to start. This modification injects a wrapper class in the JGit internal to fake a valid return value.
* | ci: Delete nightly build artefact after testing the containerFlorian Zschocke2022-11-071-7/+7
| | | | | | | | | | | | Leave the artefact until after the container has been built and tested. In case the test fails the artefact can be still downloaded to analyse what might have caused the container build or test to fail.
* | Update Bugtraq to v0.4Florian Zschocke2022-11-075-21/+146
| | | | | | | | Sync with upstream @ https://github.com/mstrap/bugtraq
* | Merge branch 'pr-1214' into masterFlorian Zschocke2022-11-063-13/+13
|\ \ | | | | | | | | | | | | Fix conflict from earlier JGit update to 4.5 Add updated Eclipse and IntelliJ files.
| * | Fix jgit version to one that is found in Maven CentralFlorian Zschocke2022-11-061-1/+1
| | |
| * | Update jgit to 4.6.1.201703071140-r.123-g5094c1a5cpaladox2017-03-181-1/+1
| | |
| * | Update jgit to 4.5.0.201609210915-rpaladox2017-03-181-1/+1
| | |
| * | Update jgit to 4.6.1.201703071140-r.123-g5094c1a5cpaladox2017-03-181-1/+1
| | |
* | | Merge branch 'pr-1213' into masterFlorian Zschocke2022-11-063-6/+110
|\ \ \ | | | | | | | | | | | | | | | | Fix conflict in updated slf4j version. Add updated Eclipse and IntelliJ files.
| * | | Add missing jetty-xml dependency.Florian Zschocke2022-11-061-0/+1
| | | |
| * | | Fix compiling jetty 9.3paladox2017-03-181-1/+8
| | | | | | | | | | | | jetty-all was converted to a uber jar and not a jar. So it was failing to resolve.
| * | | Update jetty to 9.3.16.v20170120paladox2017-03-181-1/+1
| |/ /
* | | Merge branch 'sshkey_form_feedback' into masterFlorian Zschocke2022-11-014-1/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back in a change that was implemented in a pull request from 2017, but got lost in the chaos of multiple pull requests from intermingling branches. This does not only provide feedback when a SSH key cannot be parsed, but it also does so in a way that the warning goes away when a correct key is added. Admittedly, I have no idea how to properly do this with a Wicket FeedbackMessage, all I could find on Google was highly complicated. Not only does this bring back (or really in) the fix for issue #1226, but it also fixes #984.
| * | | Replace key feedback with label instead of FeedbackMessageFlorian Zschocke2022-11-013-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | Since it is a pest to get rid of a Wicket FeedbackMessage in an AJAX target, change the code to use an extra label that can provide feedback if the key could not be parsed or was empty.
| * | | Add feedback to SSH Key Form. #1226Martin Spielmann2022-11-014-1/+9
|/ / / | | | | | | | | | | | | if key is empty of can not be parsed, form did provide any feedback to user before
* | | Fix paths after update of checkout actionFlorian Zschocke2022-11-011-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Github 'checkout' action was updated from v1 to v3. But the behaviour changed between the two which broke this workflow. The old action would clone other repositories not into the workspace but parallel to the workspace. The new version does every clone/checkout relative to the workspace. That means that where previously the gitblit-docker repository would be cloned in parallel to the workspace which is gitblit/gitblit, it is now cloned into the gitblit/gitblit directory path. So remove all the references to `../gitblit-docker`. The files are in the current directory now.
* | | Merge pull request #1435 from flaix/fix-authority-npFlorian Zschocke2022-11-012-2/+7
|\ \ \ | | | | | | | | Fix crash in Gitblit Authority for deleted users
| * | | authority: Fix null pointer crash for deleted usersFlorian Zschocke2022-11-012-2/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user had a certificate, i.e. an entry in the Gitblit Authority database, but the user was deleted from the Gitblit database, then the Authority application crashes upon loading. This patch prevents the crash. The deleted user is no longer shown in the Authority. But the database entry still is kept. This should be improved to show deleted users and give the possibility to delete them from the Authority's database. This fixes #1359
* | | Merge pull request #1434 from flaix/update-guiceFlorian Zschocke2022-10-314-15/+99
|\ \ \ | | | | | | | | Update Guice version to 5.1.0
| * | | deps: Update Guice version to 5.1.0Florian Zschocke2022-10-314-15/+99
|/ / / | | | | | | | | | | | | | | | | | | | | | Update Guice to 5.1.0. This version is compatible with Java 17. The gitblit patch of the servlet extension was ported to Guice 5.1.0, too. The update of Guice requires an update of the Guava version, too. Thus Guava is updated to 27.0.1-jar.
* | | Merge pull request #1433 from flaix/np-fixFlorian Zschocke2022-10-311-0/+3
|\ \ \ | | | | | | | | Fix null pointer exception in FileSettings
| * | | fix: Fix null pointer exception in FileSettingsFlorian Zschocke2022-10-311-0/+3
|/ / / | | | | | | | | | | | | Fix a null pointer access in the `toString` method for a freshly created `FileSettings`.
* | | Merge pull request #1430 from flaix/update-actionsFlorian Zschocke2022-10-282-16/+19
|\ \ \ | | | | | | | | Update workflows due to deprecations in actions
| * | | ci: Replace set-output command with echo to GITHUB_OUTPUTFlorian Zschocke2022-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | The `set-output` command was deprecated. The new way to set an output parameter for a step is to echo to the file stored in `$GITHUB_OUTPUT`
| * | | ci: Update action versions in nightly build workflowFlorian Zschocke2022-10-271-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions are updated for various actions that have a new version which uses NodeJS 16. One action has no updated version available yet: `e1himself/goss-installation-action` But an issue exists mentioning that it needs an update.
| * | | ci: Update action versions in push build workflowFlorian Zschocke2022-10-271-4/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workflow runs started issuing warnings because NodeJS 12 was deprecated. Actions need to get updated to newer versions that use NodeJS 16. This commit updates the `actions/checkout` and the `actions/setup-java` actions to the latest version in the workflow that builds on every push. The new setup-java action requires the distribution to be specified, since multiple JDK distributions are supported now. We chose Eclipse's Temurin here which is the successor to AdoptOpenJDK, which we use for development.
* | | ci: Build pull requests, tooFlorian Zschocke2022-10-271-1/+5
| | | | | | | | | | | | Build pull requests, just like we build on every push.