summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix some stuffwinh-jsdocWinnie Hellmann2018-12-0518-10/+80
* Setup JSDocWinnie Hellmann2018-12-053-2/+123
* Merge branch 'ce-jej/group-saml-unlink-from-account' into 'master'Stan Hu2018-12-044-5/+18
|\
| * Replace @user with current_user on Account pageJames Edwards-Jones2018-12-042-5/+4
| * Backport GroupSAML unlink changesJames Edwards-Jones2018-12-044-5/+19
* | Merge branch 'gt-remove-pronunciation-tip-for-knative' into 'master'Mike Greiling2018-12-042-8/+7
|\ \
| * | Remove pronunciation tip for knativeGeorge Tsiolis2018-12-042-8/+7
* | | Merge branch 'define-default-value-for-only-except-keys' into 'master'Kamil Trzciński2018-12-0412-177/+261
|\ \ \
| * | | Define the default value for only/except policiesShinya Maeda2018-12-0512-177/+261
* | | | Merge branch 'disable-automatic-merge' into 'master'Marin Jankovski2018-12-041-0/+1
|\ \ \ \
| * | | | Temporarily disable automatic mergingYorick Peterse2018-12-041-0/+1
* | | | | Revert "Revert "Remove runner token indices from db schema as well""Yorick Peterse2018-12-041-3/+0
* | | | | Revert "Remove runner token indices from db schema as well"🤖 GitLab Bot 🤖2018-12-041-0/+3
* | | | | Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas2018-12-0437-74/+989
|\ \ \ \ \
| * | | | | Fix typo in encrypted token authenticatable strategyGrzegorz Bizon2018-12-041-1/+1
| * | | | | Remove runner token indices from db schema as wellGrzegorz Bizon2018-12-041-3/+0
| * | | | | 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-04357-2056/+4364
| |\ \ \ \ \
| * | | | | | Fix token_set? method by checking migration statusGrzegorz Bizon2018-12-041-1/+4
| * | | | | | Use plaintext token when migration is not completeGrzegorz Bizon2018-12-035-26/+21
| * | | | | | Refactor encrypted token strategy classGrzegorz Bizon2018-12-032-28/+33
| * | | | | | Fix token encrypted strategy when migrating dataGrzegorz Bizon2018-12-032-1/+24
| * | | | | | Migrate runners token first before fully switchingGrzegorz Bizon2018-12-033-3/+3
| * | | | | | Do not add indices for encrypted tokens in this iterationGrzegorz Bizon2018-12-031-21/+0
| * | | | | | Use proper scope when accessting application settingsGrzegorz Bizon2018-12-031-1/+1
| * | | | | | Implement migration strategy for token authenticatableGrzegorz Bizon2018-12-033-39/+144
| * | | | | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r...Grzegorz Bizon2018-11-29172-729/+2337
| |\ \ \ \ \ \
| * | | | | | | Add changelog for runners token encryption fixGrzegorz Bizon2018-11-281-0/+5
| * | | | | | | Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-281986-17252/+112271
| |\ \ \ \ \ \ \
| * | | | | | | | Pad encryption keys with UTF-8 0 instead of \0 charGrzegorz Bizon2018-11-283-8/+8
| * | | | | | | | Expire application settings after encrypting tokensGrzegorz Bizon2018-11-282-0/+8
| * | | | | | | | Fix resetting old token when fallback strategy is providedGrzegorz Bizon2018-11-271-1/+1
| * | | | | | | | Improve token authenticable tests and exceptionsGrzegorz Bizon2018-11-274-8/+10
| * | | | | | | | Adjust batch size for migrating runners tokenGrzegorz Bizon2018-11-232-9/+9
| * | | | | | | | Reduce Sidekiq signature of scheduled tokens migrationGrzegorz Bizon2018-11-234-10/+23
| * | | | | | | | Add test case for scheduling runners tokens migrationGrzegorz Bizon2018-11-232-1/+31
| * | | | | | | | Add specs for runners tokens encryption migrationGrzegorz Bizon2018-11-232-3/+86
| * | | | | | | | Improve test cases description in token-related specsGrzegorz Bizon2018-11-234-14/+12
| * | | | | | | | Only allow valid options when configuring tokensGrzegorz Bizon2018-11-232-0/+11
| * | | | | | | | Improve token strategy fallback and add more specsGrzegorz Bizon2018-11-232-0/+30
| * | | | | | | | Fix static analysis in utf8 helper methodsGrzegorz Bizon2018-11-233-6/+6
| * | | | | | | | Ensure that db encryption keys have proper bytesizeGrzegorz Bizon2018-11-225-2/+160
| * | | | | | | | Do not append new line to Base64 encoded encrypted valueGrzegorz Bizon2018-11-211-1/+1
| * | | | | | | | Add missing specs for crypto helper classGrzegorz Bizon2018-11-211-0/+37
| * | | | | | | | Schedule background migration for encrypting runners tokensGrzegorz Bizon2018-11-213-1/+59
| * | | | | | | | Add migratable models for runners tokens migrationGrzegorz Bizon2018-11-216-6/+120
| * | | | | | | | Add database indices to encrypted runner tokensGrzegorz Bizon2018-11-215-4/+25
| * | | | | | | | Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokensGrzegorz Bizon2018-11-211327-10402/+11395
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Encrypt runners communication token in the databaseGrzegorz Bizon2018-11-205-7/+23
| * | | | | | | | | Exclude runners tokens from GitLab project exportsGrzegorz Bizon2018-11-202-1/+5
View Lorry Controller Status