Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 11-6-stable-prepare-rc4 | Alex Hanselka | 2018-12-06 | 39 | -598/+1368 |
|\ | |||||
| * | Merge branch '19376-post-bfg-cleanup' into 'master' | Douglas Barbosa Alexandre | 2018-12-06 | 2 | -0/+51 |
| |\ | |||||
| | * | Use BFG object maps to clean projects | Nick Thomas | 2018-12-06 | 2 | -0/+51 |
| * | | Merge branch '54857-fix-templates-path-traversal' into 'master' | Cindy Pallares | 2018-12-06 | 3 | -1/+66 |
| |\ \ | | |/ | |/| | |||||
| | * | Prevent a path traversal attack on global file templates | Nick Thomas | 2018-12-05 | 3 | -1/+66 |
| * | | Merge branch 'blob-count2' into 'master' | Rémy Coutable | 2018-12-06 | 2 | -122/+147 |
| |\ \ | |||||
| | * | | Optimized file search to work without limits | Jan Provaznik | 2018-12-06 | 2 | -122/+147 |
| * | | | Use approximate counts for big tables | Jan Provaznik | 2018-12-06 | 2 | -0/+31 |
| * | | | Merge branch 'sh-handle-invalid-gpg-sig' into 'master' | Nick Thomas | 2018-12-06 | 1 | -0/+22 |
| |\ \ \ | |||||
| | * | | | Gracefully handle unknown/invalid GPG keys | Stan Hu | 2018-12-05 | 1 | -0/+22 |
| * | | | | Support RSA and ECDSA algorithms in Omniauth JWT | Michael Tsyganov | 2018-12-05 | 1 | -17/+53 |
| |/ / / | |||||
| * | | | Merge branch '54886-usage-data-group-clusters' into 'master' | Kamil Trzciński | 2018-12-05 | 1 | -2/+14 |
| |\ \ \ | |||||
| | * | | | Add UsageData for group/project clusters | Dylan Griffith | 2018-12-05 | 1 | -2/+14 |
| * | | | | Merge branch '34758-deployment-cluster' into 'master' | Kamil Trzciński | 2018-12-05 | 2 | -0/+23 |
| |\ \ \ \ | |||||
| | * | | | | Various improvements to hierarchy sorting | Thong Kuah | 2018-12-05 | 1 | -4/+16 |
| | * | | | | Add association project -> kubernetes_namespaces | Thong Kuah | 2018-12-05 | 1 | -0/+1 |
| | * | | | | Deploy to clusters for a project's groups | Thong Kuah | 2018-12-05 | 1 | -0/+10 |
| | * | | | | Modify service so that it can be re-run | Thong Kuah | 2018-12-05 | 1 | -0/+79 |
| * | | | | | Rename project's pipelines relation | Francisco Javier López | 2018-12-05 | 4 | -9/+121 |
| * | | | | | Merge branch 'osw-fix-grouping-by-file-path' into 'master' | Nick Thomas | 2018-12-05 | 2 | -10/+21 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Avoid 500's when serializing legacy diff notesosw-fix-grouping-by-file-path | Oswaldo Ferreira | 2018-12-04 | 2 | -10/+21 |
| * | | | | | Merge branch 'mr-pipelines-2' into 'master' | Kamil Trzciński | 2018-12-05 | 4 | -0/+62 |
| |\ \ \ \ \ | |||||
| | * | | | | | Merge request pipelines | Shinya Maeda | 2018-12-05 | 4 | -0/+62 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'retryable_create_or_update_kubernetes_namespace' into 'master' | Kamil Trzciński | 2018-12-05 | 1 | -0/+79 |
| |\ \ \ \ \ | |||||
| | * | | | | | Modify service so that it can be re-run | Thong Kuah | 2018-12-04 | 1 | -0/+79 |
| * | | | | | | Merge branch 'set-kubeconfig-nil-when-token-nil' into 'master' | Dmitriy Zaporozhets | 2018-12-05 | 1 | -10/+14 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | Make KUBECONFIG nil if KUBE_TOKEN is nil | Dylan Griffith | 2018-11-30 | 1 | -10/+14 |
| * | | | | | | Revert "LfsToken uses JSONWebToken::HMACToken by default" | 🤖 GitLab Bot 🤖 | 2018-12-05 | 1 | -152/+15 |
| * | | | | | | Add missing spec coverage for LfsToken | Ash McKenzie | 2018-12-05 | 1 | -0/+55 |
| * | | | | | | LfsToken uses JSONWebToken::HMACToken by default | Ash McKenzie | 2018-12-05 | 1 | -15/+152 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'define-default-value-for-only-except-keys' into 'master' | Kamil Trzciński | 2018-12-04 | 6 | -171/+41 |
| |\ \ \ \ \ | |||||
| | * | | | | | Define the default value for only/except policies | Shinya Maeda | 2018-12-05 | 6 | -171/+41 |
| * | | | | | | Merge branch 'fix/gb/encrypt-runners-tokens' into 'master' | Nick Thomas | 2018-12-04 | 3 | -0/+152 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into fix/gb/encrypt-r... | Grzegorz Bizon | 2018-12-04 | 16 | -64/+225 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Use plaintext token when migration is not complete | Grzegorz Bizon | 2018-12-03 | 1 | -4/+4 |
| | * | | | | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r... | Grzegorz Bizon | 2018-11-29 | 4 | -30/+199 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into fix/gb/encrypt-runners-tokens | Grzegorz Bizon | 2018-11-28 | 38 | -413/+525 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Pad encryption keys with UTF-8 0 instead of \0 char | Grzegorz Bizon | 2018-11-28 | 1 | -3/+3 |
| | * | | | | | | | Improve token authenticable tests and exceptions | Grzegorz Bizon | 2018-11-27 | 1 | -2/+3 |
| | * | | | | | | | Reduce Sidekiq signature of scheduled tokens migration | Grzegorz Bizon | 2018-11-23 | 1 | -8/+6 |
| | * | | | | | | | Add test case for scheduling runners tokens migration | Grzegorz Bizon | 2018-11-23 | 1 | -1/+0 |
| | * | | | | | | | Add specs for runners tokens encryption migration | Grzegorz Bizon | 2018-11-23 | 1 | -0/+79 |
| | * | | | | | | | Fix static analysis in utf8 helper methods | Grzegorz Bizon | 2018-11-23 | 1 | -2/+2 |
| | * | | | | | | | Ensure that db encryption keys have proper bytesize | Grzegorz Bizon | 2018-11-22 | 1 | -0/+38 |
| | * | | | | | | | Add missing specs for crypto helper class | Grzegorz Bizon | 2018-11-21 | 1 | -0/+37 |
| * | | | | | | | | CE port Refactor Gitlab::Checks::ChangeAccess class | Francisco Javier López | 2018-12-04 | 6 | -215/+305 |
| | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Move strategies in their own files | Andreas Brandl | 2018-12-03 | 4 | -124/+147 |
| * | | | | | | | Limit some specs to PostgreSQL only. | Andreas Brandl | 2018-12-03 | 1 | -2/+2 |
| * | | | | | | | Fix rubocop offenses. | Andreas Brandl | 2018-12-03 | 1 | -4/+4 |
| * | | | | | | | Add feature flag for tablesample counting. | Andreas Brandl | 2018-12-03 | 1 | -0/+4 |