summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename all filenames and occurrences to License Compliancedocs/license-compliance-renameAchilleas Pipinellis2019-08-2617-254/+260
* Merge branch 'ee-12032-defaults-to-python-3-docs' into 'master'Achilleas Pipinellis2019-08-261-4/+4
|\
| * License Compliance defaults to Python 3Fabien Catteau2019-08-261-4/+4
|/
* Merge branch 'master' into 'master'Achilleas Pipinellis2019-08-261-0/+23
|\
| * ci_builds also has encrypted tokensBill Bagdon2019-08-261-0/+23
|/
* Merge branch 'doc-sethgitlab-csupdate' into 'master'Achilleas Pipinellis2019-08-261-1/+31
|\
| * Updated container scanningSeth Berger2019-08-261-1/+31
|/
* Merge branch 'docs-password-storage' into 'master'Achilleas Pipinellis2019-08-262-0/+14
|\
| * Improve readability of salting descriptiondocs-password-storageChristiaan Conover2019-08-221-1/+1
| * Fix a typo in the section on stretchingChristiaan Conover2019-08-221-2/+2
| * Fix link syntax typoChristiaan Conover2019-08-211-1/+1
| * Document how GitLab stores passwordsChristiaan Conover2019-08-212-0/+14
* | Merge branch 'docs-gitaly-path-fixes' into 'master'Achilleas Pipinellis2019-08-261-9/+13
|\ \
| * | Improve Gitaly path detailsBen Bodenmiller2019-08-261-9/+13
|/ /
* | Merge branch '66132-document-new-line-chart-in-panel-metric-type' into 'master'Achilleas Pipinellis2019-08-261-1/+1
|\ \
| * | Add Documentation for `line-chart`Miguel Rincon2019-08-261-1/+1
|/ /
* | Merge branch 'user_name_migration' into 'master'Lin Jen-Shin2019-08-265-2/+53
|\ \
| * | Using before_save method instead of setterAishwarya Subramanian2019-08-265-2/+53
|/ /
* | Merge branch 'user-tracking-settings' into 'master'Jan Provaznik2019-08-268-105/+204
|\ \
| * | Changes snowplow to use cookies for sessionsJeremy Jackson2019-08-268-105/+204
|/ /
* | Merge branch 'sh-fix-nplusone-issues' into 'master'Mayra Cabrera2019-08-264-2/+15
|\ \
| * | Fix N+1 Gitaly calls in /api/v4/projects/:id/issuessh-fix-nplusone-issuesStan Hu2019-08-234-2/+15
* | | Merge branch 'bw-move-funtion-to-resolver' into 'master'Mayra Cabrera2019-08-2611-33/+58
|\ \ \
| * | | Replace echo function with a resolverBrett Walker2019-08-2611-33/+58
|/ / /
* | | Merge branch 'pl-qa-k8s' into 'master'Dan Davison2019-08-266-88/+338
|\ \ \
| * | | Extract gcloud and minikube cluster providerPeter Leitzen2019-08-266-88/+338
|/ / /
* | | Merge branch 'georgekoltsov/54023-fogbugz-visibility-level' into 'master'Rémy Coutable2019-08-263-1/+35
|\ \ \
| * | | Change default visibility level for FogBugz imported projects to PrivateGeorge Koltsov2019-08-263-1/+35
|/ / /
* | | Merge branch 'qa-use-dag-for-package-and-qa-always-job' into 'master'Lin Jen-Shin2019-08-261-4/+9
|\ \ \
| * | | Use the 'needs' keyword for 'package-and-qa-always' jobRémy Coutable2019-08-261-4/+9
* | | | Merge branch 'id-code-review-smau' into 'master'Lin Jen-Shin2019-08-267-2/+35
|\ \ \ \
| * | | | Add usage pings for merge request creatingIgor2019-08-267-2/+35
|/ / / /
* | | | Merge branch 'zj-remove-object-pools-feature-flag' into 'master'Nick Thomas2019-08-264-55/+15
|\ \ \ \
| * | | | Remove the object pools feature flagZeger-Jan van de Weg2019-08-264-55/+15
* | | | | Merge branch 'qa-copy-license-file-in-qa-image' into 'master'Lin Jen-Shin2019-08-262-1/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Copy ee/app/models/license.rb in the QA image if presentqa-copy-license-file-in-qa-imageRémy Coutable2019-08-262-1/+11
* | | | | Merge branch 'pl-rubocop-include-exclude' into 'master'Sean McGivern2019-08-2613-112/+67
|\ \ \ \ \
| * | | | | Utilize RuboCop's Include/Exclude configPeter Leitzen2019-08-2613-112/+67
|/ / / / /
* | | | | Merge branch 'renovate/gitlab-packages' into 'master'Filipa Lacerda2019-08-262-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update dependency @gitlab/ui to v5.19.0Lukas Eipert2019-08-262-5/+5
| |/ / /
* | | | Merge branch 'pl-danger-map-rubocop' into 'master'Ash McKenzie2019-08-261-0/+1
|\ \ \ \
| * | | | Danger: Map .rubocop{,_todo}.yml to ~backendPeter Leitzen2019-08-261-0/+1
|/ / / /
* | | | Merge branch '66443-unrecoverable-configuration-loop-in-external-auth-control...Nick Thomas2019-08-263-1/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Add more tests to cover all cases66443-unrecoverable-configuration-loop-in-external-auth-controlRobert Schilling2019-08-221-0/+12
| * | | Add test, reduce complexityRobert Schilling2019-08-222-2/+11
| * | | Don't check external authorization when disabling the serviceRobert Schilling2019-08-222-1/+7
* | | | Merge branch '21505-quickactions-update-pd' into 'master'Kamil Trzciński2019-08-2610-32/+197
|\ \ \ \
| * | | | Add edit_note and spec for editing quick actionsPatrick Derichs2019-08-2610-32/+197
|/ / / /
* | | | Merge branch 'da/ignore-tests-in-security-reports' into 'master'Rémy Coutable2019-08-261-0/+1
|\ \ \ \
| * | | | Dont run SAST on testsDennis Appelt2019-08-261-0/+1
|/ / / /