summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Added changelog file for this security fixEtienne Baqué2019-08-262-0/+5
| | | | | | | |
| | * | | | | | Add encrypted optional option to DeployToken authentication fieldEtienne Baqué2019-08-262-1/+1
| | | | | | | |
| | * | | | | | Added EncryptDeployTokensTokens spec fileEtienne Baqué2019-08-261-0/+47
| | | | | | | |
| | * | | | | | Added migration to encrypt token in DeployToken recordsEtienne Baqué2019-08-264-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added migrations to make token column accepting null values and to add encrypted token column.
| * | | | | | | Merge branch 'feature-branch-gather-jobs-data' into 'master'Stan Hu2019-08-2714-451/+474
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the complexity of our CI configuration Closes #51367 and #65702 See merge request gitlab-org/gitlab-ce!31728
| | * | | | | | | Reduce complexity of CI filesfeature-branch-gather-jobs-dataStan Hu2019-08-2614-451/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Merge branch 'oauth_bypass_two_factor' into 'master'Michael Kozono2019-08-277-5/+70
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to allow OAuth providers to bypass two factor Closes #56059 See merge request gitlab-org/gitlab-ce!31996
| | * | | | | | | | Update docs and comments about saml with allow_bypass_two_factordodocat2019-08-277-5/+70
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | allow_bypass_two_factor configration dose not work with saml provider
| * | | | | | | | Merge branch 'docs-no-more-k8s-service-template' into 'master'Evan Read2019-08-271-3/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Remove mention of Kubernetes service templates See merge request gitlab-org/gitlab-ce!32093
| | * | | | | | | | Remove mention of Kubernetes service templatesdocs-no-more-k8s-service-templateThong Kuah2019-08-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has since been removed
| * | | | | | | | | Merge branch 'doc_api_events' into 'master'Evan Read2019-08-271-6/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc/api/events.md See merge request gitlab-org/gitlab-ce!32071
| | * | | | | | | | Update doc/api/events.mdAlexis Sánchez2019-08-271-6/+6
| |/ / / / / / / /
| * | | | | | | | Merge branch 'ci-job-rules-docs' into 'master'Evan Read2019-08-271-0/+120
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI Yaml configuration docs for using job rules See merge request gitlab-org/gitlab-ce!32026
| | * | | | | | | | CI Yaml configuration docs for using job rulesdrew2019-08-271-0/+120
| |/ / / / / / / /
| * | | | | | | | Merge branch 'sh-fix-piwik-template' into 'master'Ash McKenzie2019-08-273-2/+27
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Piwik not working Closes #66627 See merge request gitlab-org/gitlab-ce!32234
| | * | | | | | | | Fix Piwik not workingsh-fix-piwik-templateStan Hu2019-08-263-2/+27
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to indentation, the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31402 broke the templating of Piwik script header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66627
| * | | | | | | | Merge branch 'sh-guard-against-orphaned-project-feature' into 'master'Michael Kozono2019-08-263-0/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against deleted project feature entry Closes #66482 See merge request gitlab-org/gitlab-ce!32187
| | * | | | | | | | Guard against deleted project feature entryStan Hu2019-08-263-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/issues/66482, we see that a project's `project_feature` association may be lazily loaded and hence return `nil` if the entry is deleted if the `Project` is already loaded in memory. To ensure we don't fail hard when this happens, assume all features are disabled. We can fix this issue by eager loading the `project_feature` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32169, but we shouldn't have to depend on that. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
| * | | | | | | | | Merge branch 'revert-e2251a09' into 'master'Mayra Cabrera2019-08-268-204/+105
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'user-tracking-settings' into 'master'" See merge request gitlab-org/gitlab-ce!32235
| | * | | | | | | | | Revert "Merge branch 'user-tracking-settings' into 'master'"Jeremy Jackson2019-08-268-204/+105
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !31826
| * | | | | | | | | Merge branch 'ab-codeowners-database' into 'master'Mayra Cabrera2019-08-261-6/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change database codeowners to database maintainer group See merge request gitlab-org/gitlab-ce!32229
| | * | | | | | | | | Change database maintainers group for codeownersAndreas Brandl2019-08-261-6/+7
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligning with backend maintainers, @gitlab-org/maintainers/database is now used for codeowners.
| * | | | | | | | | Merge branch 'setting_mirror_repos_too_big' into 'master'Tim Zallmann2019-08-262-5/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps: remove the too big "Mirror a repository" header Closes #66445 See merge request gitlab-org/gitlab-ce!32097
| | * | | | | | | | locale: remove unused "Mirror a repository" entryNeroBurner2019-08-231-3/+0
| | | | | | | | | |
| | * | | | | | | | apps: remove the too big "Mirror a repository" headerNeroBurner2019-08-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/66445
| * | | | | | | | | Merge branch 'docs/53811-move-multiple-issue-boards-to-free-and-core' into ↵Achilleas Pipinellis2019-08-263-22/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Added note that Multiple Issue Boards moved tiers. See merge request gitlab-org/gitlab-ce!31829
| | * | | | | | | | | Added note that Multiple Issue Boards moved tiers.Russell Dickenson2019-08-263-22/+14
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'patch-74' into 'master'Mike Greiling2019-08-262-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix: remove double % See merge request gitlab-org/gitlab-ce!32178
| | * | | | | | | | | fix: remove double % from layout width descriptionВладислав Поляков2019-08-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update show.html.haml
| * | | | | | | | | | Merge branch 'docs-jv-gitaly-concurrency-limiter' into 'master'Achilleas Pipinellis2019-08-261-0/+41
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about Gitaly concurrency limiter See merge request gitlab-org/gitlab-ce!31902
| | * | | | | | | | | | Add documentation about Gitaly concurrency limiterJacob Vosmaer2019-08-261-0/+41
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '13764-fix' into 'master'Mayra Cabrera2019-08-261-2/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary include Closes gitlab-ee#13764 See merge request gitlab-org/gitlab-ce!32173
| | * | | | | | | | | Remove unnecessary includeReuben Pereira2019-08-261-2/+0
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'mdl-to-markdownlint' into 'master'Achilleas Pipinellis2019-08-2610-64/+55
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change mdl to markdownlint for docs linting Closes #65806 See merge request gitlab-org/gitlab-ce!31994
| | * | | | | | | | | Change docs markdown linterMarcel Amirault2019-08-2610-64/+55
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change from ruby mdl to node markdownlint, add config file to root of project, delete old config file, update exceptions, and fix one doc that was didn't meet standards
| * | | | | | | | | Merge branch 'docs-kramdown-warnings-3' into 'master'Achilleas Pipinellis2019-08-263-181/+170
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add backticks and remove brackets causing kramdown warnings See merge request gitlab-org/gitlab-ce!32197
| | * | | | | | | | | Add backticks and remove square bracketsMarcel Amirault2019-08-263-181/+170
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Square and Angle bracket use causes kramdown warnings, so changed or enclosed in backticks as needed
| * | | | | | | | | Merge branch 'ee-12032-defaults-to-python-3-docs' into 'master'Achilleas Pipinellis2019-08-261-4/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that License Compliance defaults to Python 3 See merge request gitlab-org/gitlab-ce!31910
| | * | | | | | | | | License Compliance defaults to Python 3Fabien Catteau2019-08-261-4/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License Compliance now uses Python 3 by default. See https://gitlab.com/gitlab-org/gitlab-ee/issues/12032
| * | | | | | | | | Merge branch 'master' into 'master'Achilleas Pipinellis2019-08-261-0/+23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs for forgotten secrets file See merge request gitlab-org/gitlab-ce!31393
| | * | | | | | | | | ci_builds also has encrypted tokensBill Bagdon2019-08-261-0/+23
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These need to be reset
| * | | | | | | | | Merge branch 'doc-sethgitlab-csupdate' into 'master'Achilleas Pipinellis2019-08-261-1/+31
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added sample to container scanning See merge request gitlab-org/gitlab-ce!32166
| | * | | | | | | | | Updated container scanningSeth Berger2019-08-261-1/+31
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated container scanning docs with a sample config
| * | | | | | | | | Merge branch 'docs-password-storage' into 'master'Achilleas Pipinellis2019-08-262-0/+14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how GitLab stores passwords See merge request gitlab-org/gitlab-ce!32077
| | * | | | | | | | | Improve readability of salting descriptiondocs-password-storageChristiaan Conover2019-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a comma in the final sentence of the description of salting, to improve the readability of what's being said.
| | * | | | | | | | | Fix a typo in the section on stretchingChristiaan Conover2019-08-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a typo in the description of how passwords are stretched.
| | * | | | | | | | | Fix link syntax typoChristiaan Conover2019-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a missing parentheses in the markdown for a link caused by the URL containing parentheses.
| | * | | | | | | | | Document how GitLab stores passwordsChristiaan Conover2019-08-212-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide details on how GitLab stores passwords, including hashing, stretching, and salting. This was driven by a customer asking for this information for a security compliance audit report.
| * | | | | | | | | | Merge branch 'docs-gitaly-path-fixes' into 'master'Achilleas Pipinellis2019-08-261-9/+13
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Gitaly path details See merge request gitlab-org/gitlab-ce!31931
| | * | | | | | | | | | Improve Gitaly path detailsBen Bodenmiller2019-08-261-9/+13
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related to https://gitlab.com/gitlab-org/gitlab-ce/issues/65422