summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Add association project -> kubernetes_namespacesThong Kuah2018-12-051-0/+1
| * | | | | | | | Deploy to clusters for a project's groupsThong Kuah2018-12-052-0/+23
| * | | | | | | | Modify service so that it can be re-runThong Kuah2018-12-051-4/+5
| * | | | | | | | Call ClusterPlatformConfigureWorker to re-use codeThong Kuah2018-12-051-10/+2
* | | | | | | | | Merge branch '50626-searching-users-by-the-admin-panel-wipes-query-when-using...James Lopez2018-12-052-16/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Keep sorting selection when search users on admin panelDmitriy Zaporozhets2018-12-041-1/+4
| * | | | | | | | | Fix losing search query when sort users on admin users pageDmitriy Zaporozhets2018-12-032-15/+16
* | | | | | | | | | Rename project's pipelines relationFrancisco Javier López2018-12-0513-25/+40
* | | | | | | | | | Merge branch 'multiple-diff-line-discussions-fix' into 'master'Filipa Lacerda2018-12-051-3/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed multiple discussions getting added to diff linesPhil Hughes2018-12-051-3/+9
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/gb/improve-timeout-inputs-help-sections' into 'master'Kamil Trzciński2018-12-056-6/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add custom validation message for chronic duration attributeGrzegorz Bizon2018-12-054-4/+10
| * | | | | | | | | | Update help sections for max build timeout inputsGrzegorz Bizon2018-12-052-2/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'osw-fix-grouping-by-file-path' into 'master'Nick Thomas2018-12-051-5/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Avoid 500's when serializing legacy diff notesosw-fix-grouping-by-file-pathOswaldo Ferreira2018-12-041-5/+2
* | | | | | | | | | Merge branch 'mr-pipelines-2' into 'master'Kamil Trzciński2018-12-059-15/+58
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Change merge request value to 10Shinya Maeda2018-12-051-1/+1
| * | | | | | | | | Merge request pipelinesShinya Maeda2018-12-059-15/+58
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bw-serializer-tech-debit-2' into 'master'Douwe Maan2018-12-056-29/+65
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Adjust weight property to accomodate EEBrett Walker2018-12-041-1/+0
| * | | | | | | | Extract code into IssueBoardEntityBrett Walker2018-12-046-29/+66
* | | | | | | | | Adjust divider margin to comply with design specsWinnie Hellmann2018-12-051-0/+1
* | | | | | | | | 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-053-17/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Rename to CreateOrUpdateServiceAccountServiceThong Kuah2018-12-053-3/+3
| * | | | | | | | Modify service so that it can be re-runThong Kuah2018-12-041-4/+5
| * | | | | | | | Call ClusterPlatformConfigureWorker to re-use codeThong Kuah2018-12-041-10/+2
* | | | | | | | | Merge branch 'set-kubeconfig-nil-when-token-nil' into 'master'Dmitriy Zaporozhets2018-12-053-9/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make KUBECONFIG nil if KUBE_TOKEN is nilDylan Griffith2018-11-303-9/+3
* | | | | | | | | | Merge branch 'expand-diff-bug' into 'master'Filipa Lacerda2018-12-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fixed diff files not expandingPhil Hughes2018-12-041-1/+1
* | | | | | | | | | Add Project#lfs_http_url_to_repo from EEAsh McKenzie2018-12-051-0/+5
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | 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
View Lorry Controller Status