summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add merge type setting to repository page.ticket/104Florian Zschocke2014-09-073-2/+11
| | | | The merge type is a per repository setting. Add it to the edit page.
* Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2014-09-077-96/+364
| | | | | | | | | | | | | Add the option to merge a ticket branch to the integration branch only when it can be fast-forwarded, or always with a merge commit, or by fast-foward if possible, otherwise with a merge commit. Adds a new property ticket.mergeType with the valid values FAST_FOWARD_ONLY, MERGE_ALWAYS and MERGE_IF_NECESSARY. Merging and canMerge were refactored to make use of a new IntegrationStrategy class for each type of strategy.
* Merge branch 'ticket/164' into developJames Moger2014-09-0736-684/+1092
|\
| * Apply the relaxed XSS filter to Markdown commit messagesJames Moger2014-09-071-1/+2
| |
| * Enforce relaxed XSS filtering on markup documentsJames Moger2014-09-076-463/+480
| |
| * Implement a SafeTextModel and use that for fields vulnerable to XSSJames Moger2014-09-075-11/+112
| |
| * XSS sanitize standard page url parametersJames Moger2014-09-072-189/+221
| |
| * Create infrastructure for XSS sanitizationJames Moger2014-09-0723-22/+277
| |
| * Merged #167 "Do not let new forks inadvertently disclose repository contents"James Moger2014-09-051-0/+7
| |\
* | \ Merge branch 'ticket/167' into developJames Moger2014-09-051-0/+7
|\ \ \ | | |/ | |/|
| * | New forks shall respect the source repository access restrictionJames Moger2014-09-051-0/+7
| |/ | | | | | | | | If the source repository access restriction exceeds the fork default (push) then the fork shall inherit the source repository access restriction.
| * Merged #166 "Fix XRF vulnerability"James Moger2014-09-051-0/+3
| |\
* | \ Merge branch 'ticket/166' into developJames Moger2014-09-051-0/+3
|\ \ \ | | |/ | |/|
| * | Specify response header X-Frame-Options SAMEORIGIN for generated pagesJames Moger2014-09-051-0/+3
| |/
| * Merged #165 "Fix flash security risk"James Moger2014-09-052-2/+2
| |\
* | \ Merge branch 'ticket/165' into developJames Moger2014-09-052-2/+2
|\ \ \ | | |/ | |/|
| * | Change Clippy's script access attributeJames Moger2014-09-052-2/+2
| |/
| * Merged #163 "Raw servlet fails with long project names"James Moger2014-09-051-4/+1
| |\
* | \ Merge branch 'ticket/163' into developJames Moger2014-09-051-4/+1
|\ \ \ | | |/ | |/|
| * | Fix NPE in raw servlet for long project namesJames Moger2014-09-051-4/+1
| |/
| * Merged #156 "Update stable 1.6.x SSHD to 0.11.1-atlassian-1"James Moger2014-09-043-6/+7
| |\
| | * Update to SSHD 0.11.1-atlassian1James Moger2014-09-043-6/+7
| |/
| * Merged #154 "Raw servlet returns 0-length files instead of 404s"James Moger2014-09-042-36/+42
| |\
* | \ Merged #162 "Allow plugins and extensions to be injected"James Moger2014-09-044-31/+56
|\ \ \
| * | | Allow Plugins to have injected members and Extensions to be constructedJames Moger2014-09-044-31/+56
|/ / /
* | | Merged #158 "Update Jetty version to 9.2.2"James Moger2014-09-043-7/+9
|\ \ \
| * | | Update jetty version to 9.2.2David Ostrovsky2014-09-043-7/+9
| | | |
* | | | Merged #159 "Update lucene version to 4.10"James Moger2014-09-044-31/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Bump the index version and update the LuceneVersionJames Moger2014-09-041-2/+2
| | | |
| * | | Update lucene version to 4.10David Ostrovsky2014-09-053-29/+29
|/ / /
* | | Merged #155 "Update SSHD version to 0.12"James Moger2014-09-043-10/+7
|\ \ \
| * | | Update SSHD version to 0.12David Ostrovsky2014-09-043-10/+7
|/ / / | | | | | | | | | Also switch back to Maven Central repository.
* | | Merge branch 'ticket/154' into developJames Moger2014-09-042-36/+42
|\ \ \ | | |/ | |/|
| * | Fix raw serving of files/directories that do not exist in a branch/refJames Moger2014-09-042-36/+42
| |/
| * Merged #153 "Quote all Lucene query args that have non-alphanumeric characters"James Moger2014-09-041-2/+4
| |\
* | \ Merge branch 'ticket/153' into developJames Moger2014-09-041-2/+4
|\ \ \ | | |/ | |/|
| * | Quote all Lucene query args that have non-alphanumeric charactersJames Moger2014-09-041-2/+4
| |/
| * Merged #152 "NPEs when handling tickets with non-existent milestones"James Moger2014-09-042-12/+21
| |\
* | \ Merge branch 'ticket/152' into developJames Moger2014-09-042-12/+21
|\ \ \ | | |/ | |/|
| * | Fix NPEs when handling referenced milestones that do not existJames Moger2014-09-042-12/+21
| |/
| * Merged #151 "Treat UTF-9 and UTF-18 (fake) encodings as UTF-8"James Moger2014-09-041-0/+14
| |\
* | \ Merge branch 'ticket/151' into developJames Moger2014-09-041-0/+14
|\ \ \ | | |/ | |/|
| * | Alias UTF-9 and UTF-18 as UTF-8 in JGitJames Moger2014-09-041-0/+14
| |/
| * Merged #150 "Edit repo drops missing owners from owners list"James Moger2014-09-041-2/+5
| |\
* | \ Merge branch 'ticket/150' into developJames Moger2014-09-041-2/+5
|\ \ \ | | |/ | |/|
| * | Do not drop missing owners from owners paletteJames Moger2014-09-041-2/+5
| |/
| * Merged #149 "Repo creation with initial commit fails if user does not have ↵James Moger2014-09-041-1/+3
| |\ | | | | | | | | | an email address"
| * \ Merged #148 "Do not stamp raw servlet responses with cache-control headers"James Moger2014-09-042-7/+30
| |\ \
* | \ \ Merge branch 'ticket/149' into developJames Moger2014-09-041-1/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Create email address for a user if unset for repo creationJames Moger2014-09-041-1/+3
| |/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 09:51:04 +0000