summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix some stuffwinh-jsdocWinnie Hellmann2018-12-0518-10/+80
* 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-041-5/+4
|\ \
| * | Remove pronunciation tip for knativeGeorge Tsiolis2018-12-041-5/+4
* | | Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas2018-12-047-23/+152
|\ \ \
| * | | Fix typo in encrypted token authenticatable strategyGrzegorz Bizon2018-12-041-1/+1
| * | | Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into fix/gb/encrypt-r...Grzegorz Bizon2018-12-04101-699/+1078
| |\ \ \
| * | | | Fix token_set? method by checking migration statusGrzegorz Bizon2018-12-041-1/+4
| * | | | Use plaintext token when migration is not completeGrzegorz Bizon2018-12-031-4/+6
| * | | | Refactor encrypted token strategy classGrzegorz Bizon2018-12-031-26/+31
| * | | | Fix token encrypted strategy when migrating dataGrzegorz Bizon2018-12-031-1/+7
| * | | | Migrate runners token first before fully switchingGrzegorz Bizon2018-12-033-3/+3
| * | | | Implement migration strategy for token authenticatableGrzegorz Bizon2018-12-032-4/+25
| * | | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r...Grzegorz Bizon2018-11-2958-197/+322
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-28228-1126/+1800
| |\ \ \ \ \
| * | | | | | Expire application settings after encrypting tokensGrzegorz Bizon2018-11-281-0/+3
| * | | | | | Fix resetting old token when fallback strategy is providedGrzegorz Bizon2018-11-271-1/+1
| * | | | | | Improve token authenticable tests and exceptionsGrzegorz Bizon2018-11-272-5/+5
| * | | | | | Improve test cases description in token-related specsGrzegorz Bizon2018-11-231-5/+3
| * | | | | | Only allow valid options when configuring tokensGrzegorz Bizon2018-11-231-0/+4
| * | | | | | Improve token strategy fallback and add more specsGrzegorz Bizon2018-11-231-0/+4
| * | | | | | Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokensGrzegorz Bizon2018-11-21569-7303/+3915
| |\ \ \ \ \ \
| * | | | | | | Encrypt runners communication token in the databaseGrzegorz Bizon2018-11-201-5/+4
| * | | | | | | Reset insecure token when setting an encrypted oneGrzegorz Bizon2018-11-201-1/+5
| * | | | | | | Use falback to set token if encrypted field is missingGrzegorz Bizon2018-11-201-2/+8
| * | | | | | | Do not raise if encrypted tokens field does not existGrzegorz Bizon2018-11-201-1/+12
| * | | | | | | Encrypt group / project runners registration tokensGrzegorz Bizon2018-11-162-2/+2
| * | | | | | | Add specs for token authenticable strategy factory methodGrzegorz Bizon2018-11-161-3/+3
| * | | | | | | Refactor and simplify token authenticatable concernGrzegorz Bizon2018-11-151-6/+7
| * | | | | | | Extract token authenticatable strategy fabricationGrzegorz Bizon2018-11-152-7/+12
| * | | | | | | Encrypt new instance runners registration tokensGrzegorz Bizon2018-11-154-2/+6
| * | | | | | | Add unit tests for encrypted token authenticatableGrzegorz Bizon2018-11-141-2/+2
| * | | | | | | Add specs scaffold for encrypted token authenticatableGrzegorz Bizon2018-11-141-1/+2
| * | | | | | | Remove text prepended to a class by a mistakeGrzegorz Bizon2018-11-141-2/+0
| * | | | | | | Refactor token authenticatable encrypted strategyGrzegorz Bizon2018-11-142-13/+20
| * | | | | | | Remove token_field_name method from base classGrzegorz Bizon2018-11-142-7/+3
| * | | | | | | Do not use cleartext approach for encrypted tokensGrzegorz Bizon2018-11-131-8/+8
| * | | | | | | Add `encrypted` strategy to persist encrypted tokensGrzegorz Bizon2018-11-131-0/+51
* | | | | | | | Merge branch 'diff-fix-expanding' into 'master'Filipa Lacerda2018-12-042-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated variable name to forceExpandedPhil Hughes2018-12-042-4/+4
| * | | | | | | | Fixed multiple diff line discussions not expandingPhil Hughes2018-12-042-2/+7
* | | | | | | | | CE port of Add new service to create the web ide terminalFrancisco Javier López2018-12-041-0/+5
* | | | | | | | | Merge branch 'ce-7210-add-sort-direction-button-sort-dropdown' into 'master'Sean McGivern2018-12-041-1/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [CE backport]Add sort direction button with sort dropdown for epicsFelipe Artur2018-12-031-1/+27
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Fix multiple commits shade overlapping vertical discussion lineAnnabel Dunstone Gray2018-12-041-2/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'ce-jej/group-saml-metadata-endpoint' into 'master'Kamil Trzciński2018-12-041-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | TokenAuthenticatable provides comparison methodJames Edwards-Jones2018-12-031-0/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'legacy_fallback_for_project_clusters_only' into 'master'Kamil Trzciński2018-12-041-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
View Lorry Controller Status