Florian Zschocke
90fc5ac5db
Add merge type setting to repository page.
The merge type is a per repository setting. Add it to the edit page.
преди 10 години
Florian Zschocke
eb252616d1
Add integration strategy to merge tickes fast-forward or with commit.
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.
преди 10 години
James Moger
f7174e6984
Merge branch 'ticket/164' into develop
преди 9 години
James Moger
7fdc298cf0
Apply the relaxed XSS filter to Markdown commit messages
преди 9 години
James Moger
11a1739389
Enforce relaxed XSS filtering on markup documents
преди 9 години
James Moger
209dbdd49a
Implement a SafeTextModel and use that for fields vulnerable to XSS
преди 9 години
James Moger
dfaf1fc1f6
XSS sanitize standard page url parameters
преди 9 години
James Moger
fc3a39d464
Create infrastructure for XSS sanitization
преди 9 години
James Moger
90eb5a08dd
Merged #167 "Do not let new forks inadvertently disclose repository contents"
преди 9 години
James Moger
b8a44784ba
Merge branch 'ticket/167' into develop
преди 9 години
James Moger
a08e6f9586
New forks shall respect the source repository access restriction
If the source repository access restriction exceeds the fork default (push)
then the fork shall inherit the source repository access restriction.
преди 9 години
James Moger
30dc4e420a
Merged #166 "Fix XRF vulnerability"
преди 9 години
James Moger
cf9f80f5d5
Merge branch 'ticket/166' into develop
преди 9 години
James Moger
71647a6587
Specify response header X-Frame-Options SAMEORIGIN for generated pages
преди 9 години
James Moger
fcfcd84f3f
Merged #165 "Fix flash security risk"
преди 9 години
James Moger
668a0d65fe
Merge branch 'ticket/165' into develop
преди 9 години
James Moger
f9ce9fa1be
Change Clippy's script access attribute
преди 9 години
James Moger
f422bc80b9
Merged #163 "Raw servlet fails with long project names"
преди 9 години
James Moger
884fd0d193
Merge branch 'ticket/163' into develop
преди 9 години
James Moger
0a73abb640
Fix NPE in raw servlet for long project names
преди 9 години
James Moger
3fd7928921
Merged #162 "Allow plugins and extensions to be injected"
преди 9 години
James Moger
22ed6a50dd
Allow Plugins to have injected members and Extensions to be constructed
преди 9 години
James Moger
426f5c1729
Merged #158 "Update Jetty version to 9.2.2"
преди 9 години
James Moger
3b7f58e158
Merged #159 "Update lucene version to 4.10"
преди 9 години
David Ostrovsky
98bf620048
Update jetty version to 9.2.2
преди 9 години
James Moger
3a4470aa44
Bump the index version and update the LuceneVersion
преди 9 години
David Ostrovsky
140e54bf10
Update lucene version to 4.10
преди 9 години
James Moger
6561f63e57
Merged #156 "Update stable 1.6.x SSHD to 0.11.1-atlassian-1"
преди 9 години
James Moger
10643e1a0a
Update to SSHD 0.11.1-atlassian1
преди 9 години
James Moger
d70c51d1c7
Merged #155 "Update SSHD version to 0.12"
преди 9 години
David Ostrovsky
b331474798
Update SSHD version to 0.12
Also switch back to Maven Central repository.
преди 9 години
James Moger
f1f4197727
Merged #154 "Raw servlet returns 0-length files instead of 404s"
преди 9 години
James Moger
248b7172cd
Merge branch 'ticket/154' into develop
преди 9 години
James Moger
846ee5329f
Fix raw serving of files/directories that do not exist in a branch/ref
преди 9 години
James Moger
a83841169a
Merged #153 "Quote all Lucene query args that have non-alphanumeric characters"
преди 9 години
James Moger
5a4ac53238
Merge branch 'ticket/153' into develop
преди 9 години
James Moger
a4fa1b996b
Quote all Lucene query args that have non-alphanumeric characters
преди 9 години
James Moger
4a17b9332b
Merged #152 "NPEs when handling tickets with non-existent milestones"
преди 9 години
James Moger
21fe98ebf8
Merge branch 'ticket/152' into develop
преди 9 години
James Moger
270e9e7628
Fix NPEs when handling referenced milestones that do not exist
преди 9 години
James Moger
624a7215a6
Merged #151 "Treat UTF-9 and UTF-18 (fake) encodings as UTF-8"
преди 9 години
James Moger
6b76d4fb30
Merge branch 'ticket/151' into develop
преди 9 години
James Moger
e685ba747e
Alias UTF-9 and UTF-18 as UTF-8 in JGit
преди 9 години
James Moger
3a91641383
Merged #150 "Edit repo drops missing owners from owners list"
преди 9 години
James Moger
29183e1b83
Merge branch 'ticket/150' into develop
преди 9 години
James Moger
dd2dc35d6b
Do not drop missing owners from owners palette
преди 9 години
James Moger
ddcebbd982
Merged #149 "Repo creation with initial commit fails if user does not have an email address"
преди 9 години
James Moger
8679276033
Merge branch 'ticket/149' into develop
преди 9 години
James Moger
2da1f2eae6
Create email address for a user if unset for repo creation
преди 9 години
James Moger
9951ffbead
Merged #148 "Do not stamp raw servlet responses with cache-control headers"
преди 9 години