| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'fix/gb/encrypt-runners-tokens' into 'master' | Nick Thomas | 2018-12-04 | 10 | -36/+540 |
| |\ | |||||
| | * | Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into fix/gb/encrypt-r... | Grzegorz Bizon | 2018-12-04 | 70 | -293/+1584 |
| | |\ | |||||
| | * | | Use plaintext token when migration is not complete | Grzegorz Bizon | 2018-12-03 | 2 | -21/+4 |
| | * | | Refactor encrypted token strategy class | Grzegorz Bizon | 2018-12-03 | 1 | -2/+2 |
| | * | | Fix token encrypted strategy when migrating data | Grzegorz Bizon | 2018-12-03 | 1 | -0/+17 |
| | * | | Implement migration strategy for token authenticatable | Grzegorz Bizon | 2018-12-03 | 1 | -35/+119 |
| | * | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r... | Grzegorz Bizon | 2018-11-29 | 51 | -421/+1359 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into fix/gb/encrypt-runners-tokens | Grzegorz Bizon | 2018-11-28 | 164 | -2314/+3355 |
| | |\ \ \ | |||||
| | * | | | | Pad encryption keys with UTF-8 0 instead of \0 char | Grzegorz Bizon | 2018-11-28 | 2 | -7/+7 |
| | * | | | | Improve token authenticable tests and exceptions | Grzegorz Bizon | 2018-11-27 | 1 | -2/+3 |
| | * | | | | Adjust batch size for migrating runners token | Grzegorz Bizon | 2018-11-23 | 1 | -7/+7 |
| | * | | | | Reduce Sidekiq signature of scheduled tokens migration | Grzegorz Bizon | 2018-11-23 | 2 | -8/+13 |
| | * | | | | Add test case for scheduling runners tokens migration | Grzegorz Bizon | 2018-11-23 | 2 | -1/+31 |
| | * | | | | Add specs for runners tokens encryption migration | Grzegorz Bizon | 2018-11-23 | 1 | -0/+79 |
| | * | | | | Improve test cases description in token-related specs | Grzegorz Bizon | 2018-11-23 | 2 | -8/+8 |
| | * | | | | Only allow valid options when configuring tokens | Grzegorz Bizon | 2018-11-23 | 1 | -0/+7 |
| | * | | | | Improve token strategy fallback and add more specs | Grzegorz Bizon | 2018-11-23 | 1 | -0/+26 |
| | * | | | | Fix static analysis in utf8 helper methods | Grzegorz Bizon | 2018-11-23 | 2 | -5/+5 |
| | * | | | | Ensure that db encryption keys have proper bytesize | Grzegorz Bizon | 2018-11-22 | 2 | -0/+136 |
| | * | | | | Add missing specs for crypto helper class | Grzegorz Bizon | 2018-11-21 | 1 | -0/+37 |
| | * | | | | Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokens | Grzegorz Bizon | 2018-11-21 | 146 | -1060/+2544 |
| | |\ \ \ \ | |||||
| | * | | | | | Improve specs for hiding runners tokens in traces | Grzegorz Bizon | 2018-11-20 | 2 | -26/+6 |
| | * | | | | | Reset insecure token when setting an encrypted one | Grzegorz Bizon | 2018-11-20 | 1 | -0/+2 |
| | * | | | | | Add specs for token authenticable strategy factory method | Grzegorz Bizon | 2018-11-16 | 1 | -0/+32 |
| | * | | | | | Encrypt new instance runners registration tokens | Grzegorz Bizon | 2018-11-15 | 2 | -12/+27 |
| | * | | | | | Add unit tests for encrypted token authenticatable | Grzegorz Bizon | 2018-11-14 | 1 | -0/+51 |
| | * | | | | | Add specs scaffold for encrypted token authenticatable | Grzegorz Bizon | 2018-11-14 | 1 | -0/+19 |
| * | | | | | | Merge branch 'dm-update-batch-loader' into 'master' | Stan Hu | 2018-12-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Update batch-loader dependency | Douwe Maan | 2018-12-04 | 1 | -1/+2 |
| * | | | | | | | Merge branch 'diff-fix-expanding' into 'master' | Filipa Lacerda | 2018-12-04 | 2 | -0/+39 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Updated variable name to forceExpanded | Phil Hughes | 2018-12-04 | 2 | -3/+3 |
| | * | | | | | | | Fixed multiple diff line discussions not expanding | Phil Hughes | 2018-12-04 | 2 | -0/+39 |
| | |/ / / / / / | |||||
| * | | | | | | | CE port of Add new service to create the web ide terminal | Francisco Javier López | 2018-12-04 | 2 | -10/+29 |
| * | | | | | | | Merge branch 'ce-7210-add-sort-direction-button-sort-dropdown' into 'master' | Sean McGivern | 2018-12-04 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [CE backport]Add sort direction button with sort dropdown for epics | Felipe Artur | 2018-12-03 | 1 | -0/+1 |
| * | | | | | | | | Merge branch 'ce-jej/group-saml-metadata-endpoint' into 'master' | Kamil Trzciński | 2018-12-04 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Backport stub_default_url_options from EE | James Edwards-Jones | 2018-12-03 | 1 | -0/+5 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'check-unique-values-of-pipeline-enum' into 'master' | Kamil Trzciński | 2018-12-04 | 23 | -0/+56 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix coding offence | Shinya Maeda | 2018-12-04 | 14 | -28/+28 |
| | * | | | | | | | | Merge branch 'master-ce' into check-unique-values-of-pipeline-enum | Shinya Maeda | 2018-12-04 | 21 | -126/+595 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | fix wording | Shinya Maeda | 2018-12-03 | 23 | -23/+23 |
| | * | | | | | | | | | Fix the coding style | Shinya Maeda | 2018-12-03 | 17 | -33/+34 |
| | * | | | | | | | | | Another fix | Shinya Maeda | 2018-12-03 | 3 | -7/+7 |
| | * | | | | | | | | | Use nice message | Shinya Maeda | 2018-12-03 | 1 | -1/+4 |
| | * | | | | | | | | | Validate enum uniqueness | Shinya Maeda | 2018-12-03 | 23 | -0/+52 |
| * | | | | | | | | | | CE port Refactor Gitlab::Checks::ChangeAccess class | Francisco Javier López | 2018-12-04 | 9 | -221/+335 |
| * | | | | | | | | | | Merge branch 'legacy_fallback_for_project_clusters_only' into 'master' | Kamil Trzciński | 2018-12-04 | 2 | -3/+35 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| | * | | | | | | | | | Fallback to admin token for project clusters only | Thong Kuah | 2018-12-04 | 2 | -3/+35 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Fix collapsing discussion replies | Winnie Hellmann | 2018-12-04 | 2 | -51/+26 |
| * | | | | | | | | | Merge branch 'dm-default-request-format-html' into 'master' | Sean McGivern | 2018-12-04 | 2 | -12/+13 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |