summaryrefslogtreecommitdiffstats
path: root/src
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-0733-684/+1079
|\
| * 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-0720-22/+264
| |
* | 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.
* | 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
| |
* | Merge branch 'ticket/165' into developJames Moger2014-09-052-2/+2
|\|
| * Change Clippy's script access attributeJames Moger2014-09-052-2/+2
| |
* | 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
| |
* | Allow Plugins to have injected members and Extensions to be constructedJames Moger2014-09-041-26/+51
| |
* | Bump the index version and update the LuceneVersionJames Moger2014-09-041-2/+2
| |
* | 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
| |
* | 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
| |
* | 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
| |
* | 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
| |
* | 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"
* | \ 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
| | |
* | | Merge branch 'ticket/148' into developJames Moger2014-09-042-96/+119
|\ \ \ | | |/ | |/|
| * | Do not stamp raw servlet responses with cache-control headersJames Moger2014-09-042-7/+30
| |/
* | Merge branch 'ticket/147' into developJames Moger2014-09-041-0/+3
|\|
| * Fix NPE when anonymous admins are editing a repository (issue-490)James Moger2014-09-041-0/+3
| |
* | Merge branch 'ticket/146' into developJames Moger2014-09-041-0/+36
|\|
| * distrib: Add script to install gitblit on fedoraSoeren Grunewald2014-09-041-0/+36
| | | | | | | | | | | | | | | | | | The script will create a environment file keeping all the major settings and installs a systemd unit file. The script (mainly the unit file part) should also work for other systemd based distributions like ArchLinux. But /etc/sysconfig may not exist there. Signed-off-by: Soeren Grunewald <soeren.grunewald@desy.de>
* | Merge branch 'ticket/145' into developJames Moger2014-09-041-1933/+1933
|\|
| * distrib: Highlight C/C++ header files by defaultSoeren Grunewald2014-09-041-1933/+1933
| | | | | | | | | | | | | | We already highlight C/C++ source files with the default configuration, so we should do this also for header files. Signed-off-by: Soeren Grunewald <soeren.grunewald@desy.de>
| * Merged #144 "Pretty print perl modules"James Moger2014-09-041-1/+1
| |\
| * \ Merged #143 "Fix url-based password keaing in Redmine auth provider"James Moger2014-09-041-2/+3
| |\ \
| * \ \ Merged #142 "Update setup_authentication.mkd"James Moger2014-09-041-1/+1
| |\ \ \
| * \ \ \ Merged #141 "Allow gitblit baseFolder to be defined by a system property"James Moger2014-09-041-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'ticket/144' into developJames Moger2014-09-041-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Pretty print perl modulesMichael Legart2014-09-041-1/+1
| | | | | | | | | | | | | | | | | | Since perl scripts (.pl) was already supported, add .pm for perl modules
* | | | | | Merge branch 'ticket/143' into developJames Moger2014-09-041-2/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | fix misstyped passwords leaked in log files with redmine auth providermereth2014-08-191-2/+3
| |/ / / /
* | | | | Merge branch 'ticket/142' into developJames Moger2014-09-041-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update setup_authentication.mkdAnthony O.2014-08-081-1/+1
| |/ / / | | | | | | | | In AuthenticationManager:385, only `provider instanceof UsernamePasswordAuthenticationProvider` will be called
* | | | Merge branch 'ticket/141' into developJames Moger2014-09-041-1/+1
|\ \ \ \ | | |_|/ | |/| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-03 19:20:50 +0000