summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '54886-usage-data-group-clusters' into 'master'Kamil Trzciński2018-12-051-0/+4
|\
| * Add UsageData for group/project clustersDylan Griffith2018-12-051-0/+4
* | Merge branch '34758-deployment-cluster' into 'master'Kamil Trzciński2018-12-051-6/+23
|\ \
| * | Various improvements to hierarchy sortingThong Kuah2018-12-051-12/+14
| * | Deploy to clusters for a project's groupsThong Kuah2018-12-051-4/+19
| * | Modify service so that it can be re-runThong Kuah2018-12-051-0/+57
* | | Rename project's pipelines relationFrancisco Javier López2018-12-0511-10/+63
* | | Merge branch 'osw-fix-grouping-by-file-path' into 'master'Nick Thomas2018-12-052-0/+14
|\ \ \
| * | | Avoid 500's when serializing legacy diff notesosw-fix-grouping-by-file-pathOswaldo Ferreira2018-12-042-0/+14
* | | | Merge branch 'mk/refactor-gitlab-check-rake-tasks-ce' into 'master'Nick Thomas2018-12-0518-247/+487
|\ \ \ \
| * | | | Extract system check rake task logicMichael Kozono2018-12-0318-247/+487
* | | | | Merge branch '54826-use-read_repository-scope-on-read-only-files-endpoints' i...Grzegorz Bizon2018-12-051-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use read_repository scope on read-only files APIJames Lopez2018-12-041-0/+4
* | | | | Merge branch 'mr-pipelines-2' into 'master'Kamil Trzciński2018-12-052-1/+2
|\ \ \ \ \
| * | | | | Merge request pipelinesShinya Maeda2018-12-052-1/+2
| | |_|_|/ | |/| | |
* | | | | 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-051-0/+57
|\ \ \ \ \
| * | | | | Modify service so that it can be re-runThong Kuah2018-12-041-0/+57
* | | | | | Merge branch 'set-kubeconfig-nil-when-token-nil' into 'master'Dmitriy Zaporozhets2018-12-051-1/+3
|\ \ \ \ \ \
| * | | | | | Make KUBECONFIG nil if KUBE_TOKEN is nilDylan Griffith2018-11-301-1/+3
* | | | | | | Revert "LfsToken uses JSONWebToken::HMACToken by default"🤖 GitLab Bot 🤖2018-12-052-104/+21
* | | | | | | LfsToken uses JSONWebToken::HMACToken by defaultAsh McKenzie2018-12-052-21/+104
* | | | | | | Use user? insteadAsh McKenzie2018-12-051-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'define-default-value-for-only-except-keys' into 'master'Kamil Trzciński2018-12-044-6/+48
|\ \ \ \ \ \
| * | | | | | Define the default value for only/except policiesShinya Maeda2018-12-054-6/+48
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas2018-12-0412-15/+198
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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-04108-948/+1087
| |\ \ \ \ \
| * | | | | | Use plaintext token when migration is not completeGrzegorz Bizon2018-12-032-1/+11
| * | | | | | Use proper scope when accessting application settingsGrzegorz Bizon2018-12-031-1/+1
| * | | | | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r...Grzegorz Bizon2018-11-298-21/+120
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-2850-335/+525
| |\ \ \ \ \ \ \
| * | | | | | | | Pad encryption keys with UTF-8 0 instead of \0 charGrzegorz Bizon2018-11-281-1/+1
| * | | | | | | | Expire application settings after encrypting tokensGrzegorz Bizon2018-11-281-0/+5
| * | | | | | | | Improve token authenticable tests and exceptionsGrzegorz Bizon2018-11-271-1/+2
| * | | | | | | | Reduce Sidekiq signature of scheduled tokens migrationGrzegorz Bizon2018-11-231-1/+9
| * | | | | | | | Add specs for runners tokens encryption migrationGrzegorz Bizon2018-11-231-3/+7
| * | | | | | | | Improve test cases description in token-related specsGrzegorz Bizon2018-11-231-1/+1
| * | | | | | | | Fix static analysis in utf8 helper methodsGrzegorz Bizon2018-11-231-1/+1
| * | | | | | | | Ensure that db encryption keys have proper bytesizeGrzegorz Bizon2018-11-222-2/+16
| * | | | | | | | Do not append new line to Base64 encoded encrypted valueGrzegorz Bizon2018-11-211-1/+1
| * | | | | | | | Schedule background migration for encrypting runners tokensGrzegorz Bizon2018-11-211-0/+20
| * | | | | | | | Add migratable models for runners tokens migrationGrzegorz Bizon2018-11-216-6/+120
| * | | | | | | | Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokensGrzegorz Bizon2018-11-21327-114/+845
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Encrypt runners communication token in the databaseGrzegorz Bizon2018-11-202-1/+5
| * | | | | | | | | Exclude runners tokens from GitLab project exportsGrzegorz Bizon2018-11-202-1/+5
| * | | | | | | | | Remove Rubocop override that is no longer necessaryGrzegorz Bizon2018-11-201-2/+0
| * | | | | | | | | Find a runner using encrypted project / group tokensGrzegorz Bizon2018-11-201-2/+2
* | | | | | | | | | CE port Refactor Gitlab::Checks::ChangeAccess classFrancisco Javier López2018-12-048-281/+355
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
View Lorry Controller Status