summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Fix persistent symlink in project importJames Lopez2018-12-191-3/+5
* Merge branch '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00...Yorick Peterse2018-12-182-21/+104
* Merge branch 'revert-1cccfca1' into 'master'Grzegorz Bizon2018-12-181-16/+10
* Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'Douwe Maan2018-12-181-0/+1
* Merge branch 'remove-issue-suggestions-flag' into 'master'Douwe Maan2018-12-181-0/+4
* Merge branch 'sh-remove-gitlab-shell-include' into 'master'Rémy Coutable2018-12-172-3/+0
* Merge branch 'osw-update-mr-metrics-with-events-data' into 'master'Douwe Maan2018-12-171-0/+99
* Merge branch 'ce-jej/group-saml-sso-button-link-description' into 'master'Clement Ho2018-12-171-1/+8
* Merge branch '55054-correlation-ids-being-passed-through-grpc-metadata-are-in...Stan Hu2018-12-171-1/+1
* Merge remote-tracking branch 'origin/master' into 20422-hide-ui-variables-by-...jhampton2018-12-174-3/+48
* Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'Kamil Trzciński2018-12-171-0/+1
* Merge branch 'rs-revert-1e8f1de034aa9b6a60b640b2b091f60c4d3ba365' into 'master'Robert Speicher2018-12-171-1/+0
* Merge branch 'osw-suggest-diff-line-change' into 'master'Phil Hughes2018-12-143-0/+16
* Merge branch 're-define-default-only-except-policy' into 'master'Grzegorz Bizon2018-12-144-50/+15
* Merge branch 'fix-mr-pipelines-run-on-regex' into 'master'Grzegorz Bizon2018-12-141-4/+8
* Merge branch 'auto-devops-use-new-reports-syntax-for-sast' into 'master'Kamil Trzciński2018-12-121-1/+2
* Merge branch 'sh-fix-diff-check-issue-55137-ce' into 'master'Stan Hu2018-12-111-1/+2
* Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'Douwe Maan2018-12-111-1/+1
* Merge branch 'sh-ignore-arrays-url-sanitizer' into 'master'Rémy Coutable2018-12-111-0/+1
* Merge branch 'code-freeze-20181207' into 11-6-stable-prepare-rc5Alex Hanselka2018-12-1015-5/+512
|\
| * Merge branch 'tc-backfill-hashed-project_repositories' into 'master'Stan Hu2018-12-071-0/+134
| |\
| | * Fill project_repositories for hashed storageDouglas Barbosa Alexandre2018-12-061-41/+51
| | * Fill project_repositories for hashed storageToon Claes2018-12-061-0/+124
| * | Allow public forks to be deduplicatedZeger-Jan van de Weg2018-12-073-0/+114
| * | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-078-4/+129
| |\ \
| | * | Add `::` to Gitlab::Middleware::CorrelationIdKamil Trzciński2018-12-071-1/+1
| | * | Revert "Prefer to use correlation-id in logs"Kamil Trzciński2018-12-063-3/+3
| | * | Prefer to use correlation-id in logsKamil Trzciński2018-12-063-3/+3
| | * | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-068-4/+129
| * | | Merge branch '48889-populate-merge_commit_sha' into 'master'Douwe Maan2018-12-071-0/+132
| |\ \ \
| | * | | Fix commit with two parents is set with wrong direct_ancestorMark Chao2018-12-071-11/+22
| | * | | Update merge request's merge_commit for branch updateMark Chao2018-12-071-0/+121
| * | | | Merge branch '7772-add-subscription-table-to-gitlab-com-billing-areas-ce' int...Douwe Maan2018-12-071-1/+2
| |\ \ \ \
| | * | | | Backports some changes from gitlab-ee!7885Rubén Dávila2018-12-071-1/+2
| | |/ / /
| * | | | Encrypt CI/CD builds tokensKamil Trzciński2018-12-071-0/+1
| |/ / /
* | | | Merge branch 'master' into 11-6-stableAlex Hanselka2018-12-061-1/+0
|\ \ \ \ | |/ / /
| * | | Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"Robert Speicher2018-12-061-1/+0
| | |/ | |/|
* | | Merge branch 'master' into 11-6-stable-prepare-rc4Alex Hanselka2018-12-0652-496/+1255
|\ \ \ | |/ /
| * | Add feature flag for workhorse content type calculationFrancisco Javier López2018-12-061-0/+1
| * | Merge branch '19376-post-bfg-cleanup' into 'master'Douglas Barbosa Alexandre2018-12-063-0/+65
| |\ \
| | * | Use BFG object maps to clean projectsNick Thomas2018-12-063-0/+65
| * | | Merge branch '54857-fix-templates-path-traversal' into 'master'Cindy Pallares2018-12-063-0/+18
| |\ \ \ | | |/ / | |/| |
| | * | Prevent a path traversal attack on global file templatesNick Thomas2018-12-053-0/+18
| * | | Merge branch 'blob-count2' into 'master'Rémy Coutable2018-12-066-115/+195
| |\ \ \
| | * | | Optimized file search to work without limitsJan Provaznik2018-12-066-115/+195
| * | | | Use approximate counts for big tablesJan Provaznik2018-12-063-6/+16
| * | | | Merge branch 'sh-handle-invalid-gpg-sig' into 'master'Nick Thomas2018-12-061-7/+17
| |\ \ \ \
| | * | | | Gracefully handle unknown/invalid GPG keysStan Hu2018-12-051-7/+17
| | | |_|/ | | |/| |
| * | | | Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'Kamil Trzciński2018-12-061-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Exclude encrypted build token from import/export and retriesGrzegorz Bizon2018-12-051-0/+1