summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '11-11-stable' into 11-11-stable-patch-1Stan Hu2019-06-0411-30/+159
|\
| * Add DNS rebinding protection settingsOswaldo Ferreira2019-05-293-11/+37
| * Merge branch 'security-60143-address-xss-issue-in-wiki-links' into '11-11-sta...GitLab Release Tools Bot2019-05-281-0/+8
| |\
| | * Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-271-0/+8
| * | Fix persistent XSS in note objectsTiger2019-05-281-1/+6
| * | Merge branch 'security-fix-project-existence-disclosure-11-11' into '11-11-st...GitLab Release Tools Bot2019-05-281-2/+5
| |\ \
| | * | Fix url redaction for issue linksPatrick Derichs2019-05-031-2/+5
| * | | Merge branch 'security-60039-11-11' into '11-11-stable'GitLab Release Tools Bot2019-05-281-2/+21
| |\ \ \
| | * | | Validate MR branch namesMark Chao2019-05-061-2/+21
| | |/ /
| * | | Merge branch 'security-id-leaked-password-in-import-url-frontend-11-11' into ...GitLab Release Tools Bot2019-05-281-0/+4
| |\ \ \
| | * | | Hide password on import by url formIgor Drozdov2019-05-211-0/+4
| * | | | Merge branch 'security-fix_milestones_search_api_leak-11-11' into '11-11-stable'GitLab Release Tools Bot2019-05-282-3/+31
| |\ \ \ \
| | * | | | Resolve: Milestones leaked via search APIFelipe Artur2019-05-212-3/+31
| * | | | | Protect Gitlab::HTTP against DNS rebinding attackDouwe Maan2019-05-223-22/+58
| | |_|_|/ | |/| | |
* | | | | Merge branch 'use-source-ref-name-in-webhook' into 'master'Ash McKenzie2019-06-031-1/+1
* | | | | Merge branch 'sh-fix-omniauth-generic-strategy' into 'master'Douglas Barbosa Alexandre2019-06-031-1/+14
* | | | | Merge branch 'patch-64' into 'master'Kamil Trzciński2019-06-031-0/+1
|/ / / /
* | | | Merge branch 'sh-fix-rugged-get-tree-entries-recursive' into 'master'Douglas Barbosa Alexandre2019-05-211-0/+2
* | | | Merge branch 'revert-47e5eedc' into 'master'Grzegorz Bizon2019-05-211-4/+0
|/ / /
* | | Merge branch 'revert-c5a9bc17' into 'master'Yorick Peterse2019-05-203-69/+17
* | | Merge branch '61376-add-documentation-about-how-to-enable-puma-web-server-for...Achilleas Pipinellis2019-05-202-18/+22
|/ /
* | Merge branch 'ce-11099-removing-the-project-that-holds-the-insights-configura...Robert Speicher2019-05-071-0/+6
|\ \
| * | Add remove_foreign_key_if_existsce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-errorLin Jen-Shin2019-05-071-0/+6
* | | Merge branch '56850-add-new-unicorn-metrics' into 'master'Ash McKenzie2019-05-073-17/+69
|\ \ \
| * | | Add back ruby_memory_bytes metric, limit duplication, clean upRyan Cobb2019-04-292-9/+18
| * | | Cleanup syntax in System max_open_file_descriptorsRyan Cobb2019-04-261-4/+2
| * | | Update docs and calculate process start time via proc tableRyan Cobb2019-04-242-20/+20
| * | | Move process specific metrics to ruby samplerRyan Cobb2019-04-242-15/+15
| * | | Adds new metrics for unicorn monitoringRyan Cobb2019-04-182-8/+53
* | | | Confirm existence of head_pipeline if pipeline success requiredKerri Miller2019-05-071-0/+4
* | | | Register "gitaly_delta_islands" feature flagJacob Vosmaer2019-05-071-1/+2
* | | | Merge branch 'sh-fix-related-merge-requests-path' into 'master'Rémy Coutable2019-05-071-0/+4
|\ \ \ \
| * | | | Use a path for the related merge requests endpointsh-fix-related-merge-requests-pathStan Hu2019-05-071-0/+4
* | | | | Bump clair-local-scan to v2.0.8Olivier Gonzalez2019-05-071-1/+1
|/ / / /
* | | | Add improvements to the global search processFrancisco Javier López2019-05-073-47/+51
* | | | Merge branch 'winh-separate-frontend-fixtures' into 'master'Phil Hughes2019-05-071-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Allow to override Gitlab.ee? with IS_GITLAB_EEWinnie Hellmann2019-05-021-1/+5
* | | | Merge branch 'allow-replying-to-individual-notes-from-api' into 'master'James Lopez2019-05-071-1/+5
|\ \ \ \
| * | | | Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-apiSean McGivern2019-05-061-1/+5
* | | | | Fix issuables state_id nil when importing projects from GitHubFelipe Artur2019-05-063-0/+3
|/ / / /
* | | | Implement support for CI variables of type fileKrasimir Angelov2019-05-064-1/+7
* | | | Merge branch '30093-apply-bfg-object-map-to-database' into 'master'Douwe Maan2019-05-063-15/+35
|\ \ \ \
| * | | | Remove cleaned up OIDs from database and cacheNick Thomas2019-05-063-15/+35
* | | | | Merge branch 'jc-disconnect-git-alternates-client' into 'master'Stan Hu2019-05-062-0/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add client methods for DisconnectGitAlternates rpcjc-disconnect-git-alternates-clientJohn Cai2019-05-032-0/+14
* | | | | Merge branch 'jej/session-stored-globaly' into 'master'Dmitriy Zaporozhets2019-05-062-0/+49
|\ \ \ \ \
| * | | | | Session stored globally per requestjej/session-stored-globalyJames Edwards-Jones2019-05-022-0/+49
* | | | | | Merge branch 'ce-11225-es_limited_namespaces_removal' into 'master'Nick Thomas2019-05-061-0/+6
|\ \ \ \ \ \
| * | | | | | Backport of 328-versioned-es-schemace-11225-es_limited_namespaces_removalMario de la Ossa2019-05-021-0/+6
* | | | | | | Merge branch 'patch-49' into 'master'Sean McGivern2019-05-061-0/+1
|\ \ \ \ \ \ \