summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'security-fj-bumping-sanitize-gem-10-8' into 'security-10-8'Mayra Cabrera2018-06-201-1/+2
| | | | | [10.8] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2403
* Merge branch 'security-2682-fix-xss-for-markdown-toc-10-8' into 'security-10-8'Mayra Cabrera2018-06-201-1/+1
| | | | | [10.8] Fix xss for Markdown elements where [[_TOC_]] is enabled See merge request gitlab/gitlabhq!2407
* Fixes conflicts when picking `Resolve "gitlab 10.8 assumes that installation ↵Filipa Lacerda2018-05-305-5/+20
| | | | is a git working copy."` into `10-8-stable-patch-3`
* Merge branch 'memoize-database-version' into 'master'Rémy Coutable2018-05-301-1/+1
| | | | | Memoize Gitlab::Database.version See merge request gitlab-org/gitlab-ce!19021
* Merge branch 'security-fj-import-export-assignment-10-8' into 'security-10-8'Mayra Cabrera2018-05-256-14/+38
| | | | | [10.8] Arbitrary assignment of Project fields using "Import project" from a Gitlab tar.gz See merge request gitlab/gitlabhq!2390
* Merge branch 'security-dm-delete-deploy-key-10-8' into 'security-10-8'Mayra Cabrera2018-05-251-3/+3
| | | | | [10.8] Fix API to remove deploy key from project instead of deleting it entirely See merge request gitlab/gitlabhq!2387
* Merge branch 'sh-fast-admin-counts' into 'master'Yorick Peterse2018-05-221-0/+48
| | | | | | | Fix Error 500 viewing admin page due to statement timeouts Closes #46255 See merge request gitlab-org/gitlab-ce!18982
* Merge branch 'sh-fix-blocked-user-account-ldap' into 'master'Douwe Maan2018-05-221-1/+3
| | | | | | | Fix system hook not firing for blocked users when LDAP sign-in is used Closes #46307 See merge request gitlab-org/gitlab-ce!18930
* Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into ↵Grzegorz Bizon2018-05-221-1/+1
| | | | | | | | | 'master' Fix error when deleting an empty list of refs Closes #45743 See merge request gitlab-org/gitlab-ce!19053
* Merge branch '46498-do-not-modify-strings' into 'master'Stan Hu2018-05-222-11/+11
| | | | | | | Resolve "Blob#batch can't handle frozen string paths" Closes #46498 See merge request gitlab-org/gitlab-ce!19039
* Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-184-6/+63
| | | | | | | Block access to API & git when terms are enforced Closes #45849 See merge request gitlab-org/gitlab-ce!18816
* Merge branch 'fix-metrics-doorkeeper' into 'master'Nick Thomas2018-05-161-1/+5
| | | | | | | Fix GitLab Performance Monitoring content types for Doorkeeper Closes #46412 See merge request gitlab-org/gitlab-ce!18984
* Merge branch 'fix-metrics-content-types' into 'master'Stan Hu2018-05-151-13/+1
| | | | | | | Fix setting Gitlab metrics content types Closes gitlab-com/infrastructure#3499 See merge request gitlab-org/gitlab-ce!18975
* Merge branch 'rd-remove-duplicate-method' into 'master'Robert Speicher2018-05-141-5/+0
| | | | | Remove duplicate method See merge request gitlab-org/gitlab-ce!18886
* Merge branch ↵Douwe Maan2018-05-143-16/+34
| | | | | | | 'backport-rd-5566-improve-performance-of-repository-size-limit-check' into 'master' Backport some changes from gitlab-ee!5476 See merge request gitlab-org/gitlab-ce!18760
* Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into ↵Stan Hu2018-05-092-4/+9
| | | | | | | 'master' Raise InvalidRepository error for non-valid git repositories See merge request gitlab-org/gitlab-ce!18594
* Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-072-3/+8
|\ | | | | | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724
| * Backport 5480-epic-notifications from EEMario de la Ossa2018-05-072-3/+8
| |
* | Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-072-2/+29
|\ \ | | | | | | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218
| * \ Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-0721-63/+217
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (252 commits) Upgrade underscore.js Enable prometheus metrics by default Add signature verification badge to compare view Add Changelog Update instalation from source guide fix Web IDE file tree scroll issue Enable quick support actions default Backport of 4084-epics-username-autocomplete Remove top margin on the terms page with performance bar Backports every CE related change from ee-44542 to CE Fix typo in changelog entry fix missing space Backport IdentityLinker#failed? from GroupSaml callback flow Add ci_cd_settings delete_all dependency on project AutoDevOps Docs fix invalid external link Ignore knapsack and rspec_flaky Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages Reuses `InternalRedirect` when possible Enforces terms in the web application ...
| * | | remove unused methods until neededMike Greiling2018-05-071-22/+0
| | | |
| * | | update webpack manifest integration to recognize multi-chunk entrypointsMike Greiling2018-05-011-0/+49
| | | |
| * | | move dev server middleware to new namespaceMike Greiling2018-05-011-2/+2
| | | |
* | | | Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-072-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | CE backport of Backports Push Mirrors to CE Closes #42099 See merge request gitlab-org/gitlab-ce!18715
| * | | Backports every CE related change from ee-5484 to CETiago Botelho2018-05-072-0/+2
| | |/ | |/|
* | | Client implementation GetRawChangesZeger-Jan van de Weg2018-05-073-9/+34
| | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitaly/issues/1138
* | | Merge branch 'live-trace-v2-efficient-destroy-all' into 'master'Grzegorz Bizon2018-05-072-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Live trace: Use efficient destroy all (for `dependent: :destory` problem) See merge request gitlab-org/gitlab-ce!18575
| * \ \ Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-0711-13/+122
| |\ \ \
| * \ \ \ Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-042-3/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-0310-47/+91
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-0213-61/+172
| |\ \ \ \ \ \
| * | | | | | | Introduces `FastDestroyAll` moduleShinya Maeda2018-05-011-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-015-19/+115
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-04-306-14/+130
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix specs. Align with the new table name ci_build_trace_chunkShinya Maeda2018-04-261-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-04-2613-184/+50
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into live-trace-v2-efficient-destroy-allShinya Maeda2018-04-2512-7/+124
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement efficient destroy of job_trace_chunksKamil Trzciński2018-04-242-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Swap redis chunks when build finishedShinya Maeda2018-04-242-5/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Enforce proper 416 support for runner trace patch endpointKamil Trzciński2018-05-072-4/+15
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-0711-13/+122
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch ↵Kamil Trzciński2018-05-062-2/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui' into 'master' Resolve "Specify variables when executing a manual pipeline from the UI" Closes #44059 See merge request gitlab-org/gitlab-ce!18440
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into ↵Matija Čupić2018-05-021-40/+4
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ↵Matija Čupić2018-05-0219-66/+254
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ↵Jose2018-04-3072-181/+695
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
| | * | | | | | | | | | | | Extend Gitlab::Ci::Pipeline::Chain::Command with variables_attributesMatija Čupić2018-04-182-2/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Backports every CE related change from ee-44542 to CETiago Botelho2018-05-045-2/+84
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Backport IdentityLinker#failed? from GroupSaml callback flowJames Edwards-Jones2018-05-041-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update repository.rbKim Carlbäcker2018-05-041-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add note about rebase/squash duplication in GitalyKim Carlbäcker2018-05-041-1/+8
| | | | | | | | | | | | | |
View Lorry Controller Status