summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Print changed fileswinh-only-frontend-tests_frontend-testWinnie Hellmann2018-12-071-0/+3
* Make some dummy frontend changesWinnie Hellmann2018-12-072-0/+2
* Run only frontend tests for frontend changesWinnie Hellmann2018-12-071-0/+14
* Merge branch 'partial-index-for-merge_request_id' into 'master'Andreas Brandl2018-12-062-3/+3
|\
| * Change to partial indexpartial-index-for-merge_request_idShinya Maeda2018-12-062-3/+3
* | Merge branch 'sh-retire-redash-docs' into 'master'Rémy Coutable2018-12-062-6/+5
|\ \
| * | Remove mentions of RedashStan Hu2018-12-052-6/+5
* | | Merge branch '52285-omniauth-jwt-provider-dont-support-rsa-ecdsa-and-other-pp...Douwe Maan2018-12-066-46/+100
|\ \ \
| * | | Support RSA and ECDSA algorithms in Omniauth JWTMichael Tsyganov2018-12-056-46/+100
* | | | Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'Kamil Trzciński2018-12-069-7/+129
|\ \ \ \
| * | | | Use partial NOT NULL index for token_encrypted fieldGrzegorz Bizon2018-12-052-2/+2
| * | | | Fix build class tests for authentication tokenGrzegorz Bizon2018-12-051-2/+2
| * | | | Add specs for encrypted build authentication tokensGrzegorz Bizon2018-12-051-0/+86
| * | | | Add changelog for encrypted build tokensGrzegorz Bizon2018-12-051-0/+5
| * | | | Exclude encrypted build token from import/export and retriesGrzegorz Bizon2018-12-052-3/+4
| * | | | Encrypt builds token by default with insecure fallbackGrzegorz Bizon2018-12-051-1/+1
| * | | | Add encrypted token field to ci_builds tableGrzegorz Bizon2018-12-053-1/+31
* | | | | Merge branch 'mg-fix-knative-application-row' into 'master'Kushal Pandya2018-12-063-11/+62
|\ \ \ \ \
| * | | | | Add CHANGELOG.md entry for !23577Mike Greiling2018-12-051-0/+5
| * | | | | Update test to ensure the correct applications are shownMike Greiling2018-12-051-8/+55
| * | | | | Disable knative on group clustersMike Greiling2018-12-051-0/+1
| * | | | | Remove superfluous utility classesMike Greiling2018-12-051-2/+0
| * | | | | Hide knative domain input when helm is not installedMike Greiling2018-12-051-1/+1
* | | | | | Merge branch '5426-fe-web-terminal-init-store-ce' into 'master'Phil Hughes2018-12-067-22/+61
|\ \ \ \ \ \
| * | | | | | Add projectRunners to api.jsPaul Slaughter2018-12-052-0/+27
| * | | | | | Add some 400 statuses to http_statusPaul Slaughter2018-12-051-0/+2
| * | | | | | Update IDE index.js with 'extendStore'Paul Slaughter2018-12-051-5/+5
| * | | | | | Update IDE haml view to support EE extensionsPaul Slaughter2018-12-053-17/+27
| |/ / / / /
* | | | | | Merge branch 'ce-7772-add-subscription-table-to-gitlab-com-billing-areas' int...Filipa Lacerda2018-12-062-0/+53
|\ \ \ \ \ \
| * | | | | | Add flex_gridce-7772-add-subscription-table-to-gitlab-com-billing-areasMartin Wortschack2018-11-212-0/+53
* | | | | | | Merge branch 'gt-add-top-padding-for-nested-environment-items-loading-icon' i...Filipa Lacerda2018-12-062-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Switch from `prepend-top-default` to `prepend-top-16`George Tsiolis2018-12-051-1/+1
| * | | | | | | Add top padding for nested environment items loading iconGeorge Tsiolis2018-12-052-1/+6
* | | | | | | | Merge branch 'deprecated-instance-find' into 'master'Rémy Coutable2018-12-062-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix deprecation: You are passing an instance of ActiveRecord::Base to findJasper Maes2018-11-262-1/+6
* | | | | | | | | Merge branch 'correct-link-to-docs-group-clusters' into 'master'Mike Greiling2018-12-061-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Correct link to group clusters docsThong Kuah2018-12-061-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '54336-include-tags-into-pipeline-detail-view' into 'master'Mike Greiling2018-12-059-3/+245
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Resolve "Include tags into pipeline detail view"Scott Hampton2018-12-059-3/+245
|/ / / / / / /
* | | | | | | Merge branch 'diff-expand-commit-file' into 'master'Filipa Lacerda2018-12-053-20/+54
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fixed expanding diff commit filesPhil Hughes2018-12-053-20/+54
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'docs-add-proofreaders' into 'master'Achilleas Pipinellis2018-12-051-0/+2
|\ \ \ \ \ \
| * | | | | | Update proofreader.mdMaksymilian Roman2018-12-051-0/+1
| * | | | | | Update proofreader.mdJeongwhan Choi2018-12-051-0/+1
* | | | | | | Merge branch 'gt-change-container-width-for-project-import' into 'master'Annabel Dunstone Gray2018-12-052-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Change container width for project importGeorge Tsiolis2018-12-052-0/+7
* | | | | | | | Merge branch 'replace-admin-sidebar-feature-spec-with-view-spec' into 'master'Robert Speicher2018-12-051-17/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace admin sidebar feature spec with view specRémy Coutable2018-12-041-17/+17
* | | | | | | | | Merge branch '54886-usage-data-group-clusters' into 'master'Kamil Trzciński2018-12-052-2/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add UsageData for group/project clustersDylan Griffith2018-12-052-2/+18
View Lorry Controller Status