summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"Robert Speicher2018-12-061-1/+0
* | 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
* | | | Merge branch '54886-usage-data-group-clusters' into 'master'Kamil Trzciński2018-12-051-0/+4
|\ \ \ \
| * | | | Add UsageData for group/project clustersDylan Griffith2018-12-051-0/+4
* | | | | Merge branch '34758-deployment-cluster' into 'master'Kamil Trzciński2018-12-051-6/+23
|\ \ \ \ \
| * | | | | Various improvements to hierarchy sortingThong Kuah2018-12-051-12/+14
| * | | | | Deploy to clusters for a project's groupsThong Kuah2018-12-051-4/+19
| * | | | | Modify service so that it can be re-runThong Kuah2018-12-051-0/+57
* | | | | | Rename project's pipelines relationFrancisco Javier López2018-12-058-6/+59
* | | | | | Merge branch 'osw-fix-grouping-by-file-path' into 'master'Nick Thomas2018-12-052-0/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Avoid 500's when serializing legacy diff notesosw-fix-grouping-by-file-pathOswaldo Ferreira2018-12-042-0/+14
* | | | | | Merge branch 'mr-pipelines-2' into 'master'Kamil Trzciński2018-12-052-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge request pipelinesShinya Maeda2018-12-052-1/+2
| | |/ / / | |/| | |
* | | | | Merge branch '53659-use-padded-key-for-gcm-ciphers' into 'master'Rémy Coutable2018-12-051-2/+2
|\ \ \ \ \
| * | | | | Use a 32-byte version of db_key_base for web hooksNick Thomas2018-12-051-2/+2
| |/ / / /
* | | | | Merge branch 'retryable_create_or_update_kubernetes_namespace' into 'master'Kamil Trzciński2018-12-051-0/+57
|\ \ \ \ \
| * | | | | Modify service so that it can be re-runThong Kuah2018-12-041-0/+57
* | | | | | Merge branch 'set-kubeconfig-nil-when-token-nil' into 'master'Dmitriy Zaporozhets2018-12-051-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Make KUBECONFIG nil if KUBE_TOKEN is nilDylan Griffith2018-11-301-1/+3
* | | | | | Revert "LfsToken uses JSONWebToken::HMACToken by default"🤖 GitLab Bot 🤖2018-12-052-104/+21
* | | | | | LfsToken uses JSONWebToken::HMACToken by defaultAsh McKenzie2018-12-052-21/+104
* | | | | | Use user? insteadAsh McKenzie2018-12-051-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'define-default-value-for-only-except-keys' into 'master'Kamil Trzciński2018-12-044-6/+48
|\ \ \ \ \
| * | | | | Define the default value for only/except policiesShinya Maeda2018-12-054-6/+48
* | | | | | Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas2018-12-0411-11/+196
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add a line before conditional in encrypt columns classGrzegorz Bizon2018-12-041-0/+1
| * | | | | Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into fix/gb/encrypt-r...Grzegorz Bizon2018-12-0457-885/+1018
| |\ \ \ \ \
| * | | | | | Use plaintext token when migration is not completeGrzegorz Bizon2018-12-032-1/+11
View Lorry Controller Status