summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-021-0/+5
* Merge branch 'dz-restrict-autocomplete' into 'security-9-1' Robert Speicher2017-05-311-1/+1
* Merge branch 'bvl-security-9-1-28917-contain-uploads-in-system-dir' into 'sec...Douwe Maan2017-05-314-7/+27
* Revert "Merge remote-tracking branch 'dev/security-9-1' into 9-1-stable"Timothy Andrew2017-05-305-28/+8
* Merge remote-tracking branch 'origin/9-1-stable' into security-9-1Timothy Andrew2017-05-2637-172/+375
|\
| * Merge branch '31978-cross-reference-fix' into 'master' Sean McGivern2017-05-121-6/+7
| * Remove unexistent packages from dispatcher.jsFelipe Artur2017-05-121-2/+0
| * Merge branch 'fallback-localstorage-cases' into 'master'9-1-stable-cherry-pick-fallback-localstorage-casesPhil Hughes2017-05-1010-38/+140
| * Merge branch 'fix/import-export-missing-attributes' into 'master' Rémy Coutable2017-05-101-0/+15
| * Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master'Jacob Schatz2017-05-104-3/+53
| * Merge branch 'center-related-merge-request-items-horizontally' into 'master'Filipa Lacerda2017-05-101-1/+16
| * Merge branch 'merge-request-poll-json-endpoint' into 'master' Filipa Lacerda2017-05-101-1/+1
| * Merge branch 'fix-search-not-highlighting' into 'master'Filipa Lacerda2017-05-101-1/+6
| * Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-043-6/+18
| * Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-043-3/+3
| * Merge branch 'snippets-finder-visibility' into 'security' Douwe Maan2017-05-0410-81/+69
| * Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-041-1/+1
| * Merge branch 'snippets_visibility' into 'security' Sean McGivern2017-05-041-9/+9
| * Merge branch 'droplab-templating-xss-fix' into 'master'Jacob Schatz2017-05-044-10/+13
| * Merge branch 'rs-sanitize-submodule-urls' into 'security' Douwe Maan2017-05-041-16/+30
* | Upload all files in `uploads/system`Bob Van Landuyt2017-05-244-7/+27
* | Allow users autocomplete by author_id only for authenticated usersDmitriy Zaporozhets2017-05-061-1/+1
* | Fix for hamlit filter XSS in project importBrian Neel2017-04-283-3/+3
|/
* Merge branch 'fix-sidebar-block-ref-test' into 'master' Sean McGivern2017-04-281-2/+2
* Merge branch 'zj-accept-default-branch-param' into 'master' Douwe Maan2017-04-282-1/+2
* Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-281-1/+3
* Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-281-1/+2
* Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-mini...Sean McGivern2017-04-281-1/+1
* Merge branch '30645-show-pipeline-events-description' into 'master' Kamil Trzciński2017-04-281-2/+2
* Merge branch '2246-uuid-is-nil-for-new-installation' into 'master'Sean McGivern2017-04-281-0/+9
* Fix logic in Users::CreateService broken by the fix for OAuth usersRémy Coutable2017-04-261-8/+15
* Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-261-4/+4
* Merge branch '31174-project-integration-service-sub-nav' into 'master' Alfredo Sumaran2017-04-263-2/+3
* Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-261-1/+1
* Merge branch 'rc/dm-fix-oauth-user-creation-9-1-stable' into '9-1-stable' Robert Speicher2017-04-251-4/+4
|\
| * Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabledrc/dm-fix-oauth-user-creation-9-1-stableDouwe Maan2017-04-251-4/+4
* | Wrap MR content -stable branchAnnabel Dunstone Gray2017-04-252-13/+24
|/
* Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into 'mast...Yorick Peterse2017-04-251-11/+23
* Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-253-57/+67
* Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-251-0/+4
* Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-252-3/+25
* Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-252-5/+9
* Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-252-1/+9
* Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-241-1/+1
* Revert "Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmati...Felipe Artur2017-04-215-88/+28
* Merge branch 'sh-fix-issue-31215-2' into 'master' Douwe Maan2017-04-221-1/+1
* Merge branch '2989-run-cicd-pipelines-on-a-schedule-experimental-doc' into 'm...Achilleas Pipinellis2017-04-221-1/+1
* Merge branch '31189-pipelines-error-state-stable' into '9-1-stable' Phil Hughes2017-04-212-6/+19
|\
| * Port of 31189-pipelines-error-state to 9-1-stable31189-pipelines-error-state-stableFilipa Lacerda2017-04-212-6/+19
* | Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmation' into...Filipa Lacerda2017-04-215-28/+88
|/