summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | Override hostname when connecting via KubeclientThong Kuah2019-08-215-18/+269
| | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kubeclient uses rest-client. We hack into to access the net/http object so that we can patch to connect to the resolved IP + set hostname_override. Add specs for discord. The discord integration also uses rest-client, so since we patched rest-client, spec that the DNS rebinding protection works
| * | | | | | | | | | | | | | | | | Merge branch 'security-64711-fix-commit-todos' into 'master'GitLab Release Tools Bot2019-08-293-20/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send TODOs for comments on commits correctly See merge request gitlab/gitlabhq!3361
| | * | | | | | | | | | | | | | | | | Send TODOs for comments on commits correctlyNick Thomas2019-08-233-20/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present, the TodoService uses the `:read_project` ability to decide whether a user can read a note on a commit. However, commits can have a visibility level that is more restricted than the project, so this is a security issue. This commit changes the code to use the `:read_commit` ability in this case instead, which ensures TODOs are only generated for commit notes if the users can see the commit.
| * | | | | | | | | | | | | | | | | | Merge branch 'security-gitaly-1.61.0' into 'master'GitLab Release Tools Bot2019-08-292-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly: ignore git redirects See merge request gitlab/gitlabhq!3373
| | * | | | | | | | | | | | | | | | | | Use Gitaly 1.61.0Jacob Vosmaer2019-08-262-1/+6
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 12.2.3GitLab Release Tools Bot2019-08-281-0/+28
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 12.2.2GitLab Release Tools Bot2019-08-271-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 12.0.7GitLab Release Tools Bot2019-08-271-0/+28
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge branch 'sh-add-delete-confirmation' into 'master'Michael Kozono2019-08-299-11/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it harder to delete issuables accidentally Closes #62387 See merge request gitlab-org/gitlab-ce!32376
| * | | | | | | | | | | | | | | | | Make it harder to delete issuables accidentallyStan Hu2019-08-299-11/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously submitting a DELETE request to an issuable URL would be enough to destroy it, but this should require human confirmation. We now require that the `destroy_confirm` parameter is set to a truthy value before this can complete. In addition, we log a Sentry error if a deletion arrived without confirmation. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62387
* | | | | | | | | | | | | | | | | | Merge branch 'ce-slack-close-command' into 'master'Mayra Cabrera2019-08-299-9/+218
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a close issue slack slash command See merge request gitlab-org/gitlab-ce!32150
| * | | | | | | | | | | | | | | | | | Add a close issue slack slash commandSarah Yasonik2019-08-299-9/+218
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a slash command in slach for closing issues. See https://docs.gitlab.com/ee/integration/slash_commands.html for documentation on the wider feature set.
* | | | | | | | | | | | | | | | | | Merge branch 'ce-update-es-indexer' into 'master'Mayra Cabrera2019-08-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Update the ES indexer to v1.3.0 See merge request gitlab-org/gitlab-ce!32406
| * | | | | | | | | | | | | | | | | | CE: Update the ES indexer to v1.3.0Nick Thomas2019-08-291-1/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'patch-git-private-email-instruction' into 'master'Nick Thomas2019-08-292-1/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix: show preferred commit email in empty project page See merge request gitlab-org/gitlab-ce!32182
| * | | | | | | | | | | | | | | | | | fix: show preferred commit email in empty project pageYuping Zuo2019-08-292-1/+37
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'tc-cleanup-issue-created-text-mail' into 'master'Mike Greiling2019-08-293-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring text mail for new issue & MR more in line See merge request gitlab-org/gitlab-ce!32254
| * | | | | | | | | | | | | | | | | | Bring text mail for new issue & MR more in linetc-cleanup-issue-created-text-mailToon Claes2019-08-273-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make these templates for mail notifications for a new issue and a new merge request more similar. Also remove some leading whitespace in text mails.
* | | | | | | | | | | | | | | | | | | Merge branch 'revert-64251-branch-cache' into 'master'Stan Hu2019-08-297-254/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Cache branch and tag names as Redis sets" See merge request gitlab-org/gitlab-ce!32408
| * | | | | | | | | | | | | | | | | | | Revert "Cache branch and tag names as Redis sets"Nick Thomas2019-08-297-254/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0eff75fa2b6691b6fba31fcc2842f51debd249a9.
* | | | | | | | | | | | | | | | | | | | Merge branch 'fix-dropdown-closing' into 'master'Mike Greiling2019-08-293-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dropdown closing when mouseup is outside See merge request gitlab-org/gitlab-ce!32084
| * | | | | | | | | | | | | | | | | | | | Fix dropdown closing when mouseup is outsidefix-dropdown-closingHeinrich Lee Yu2019-08-293-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the document event listener to listen to mousedown instead of click
* | | | | | | | | | | | | | | | | | | | | Merge branch 'runner-chart-repo-use-new-location' into 'master'Mike Greiling2019-08-295-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new location for gitlab-runner helm charts See merge request gitlab-org/gitlab-ce!32384
| * | | | | | | | | | | | | | | | | | | | | Use new location for gitlab-runner helm chartsrunner-chart-repo-use-new-locationBalasankar "Balu" C2019-08-295-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | | | | | | | | | | | | | | | | | Merge branch '62673-clean-note-app-tests' into 'master'Mike Greiling2019-08-292-16/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make test of note app with comments disabled dry Closes #62673 See merge request gitlab-org/gitlab-ce!32383
| * | | | | | | | | | | | | | | | | | | | | | make test of note app with comments disabled dryManeschi Romain2019-08-292-16/+20
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Paul Slaughter2019-08-292-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66766-install-specific-visual-review-tools-npm-package-version' into 'master' Resolve "Install specific visual review tools NPM package version" Closes #66766 See merge request gitlab-org/gitlab-ce!32404
| * | | | | | | | | | | | | | | | | | | | | | Lock down visual-review-tools versionScott Hampton2019-08-292-2/+2
|/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the caret from the visual-review-tools version so that we don't accidentally introduce bugs on new releases.
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd-add-custom-endpoint-for-new-registrations' into 'master'Sean McGivern2019-08-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom endpoint for new registrations See merge request gitlab-org/gitlab-ce!32233
| * | | | | | | | | | | | | | | | | | | | | | Moved construction of name to EE namespacerd-add-custom-endpoint-for-new-registrationsAishwarya Subramanian2019-08-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Moved construction of name to EE namespaceAishwarya Subramanian2019-08-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Modified route to nest under -Aishwarya Subramanian2019-08-272-5/+2
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Added skip_authorization as true for trialsAishwarya Subramanian2019-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Added routes for trial registration apiAishwarya Subramanian2019-08-262-1/+11
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refactor/check-progress-services' into 'master'Jan Provaznik2019-08-295-76/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DRY check progress services See merge request gitlab-org/gitlab-ce!32335
| * | | | | | | | | | | | | | | | | | | | | | | DRY check progress servicesJoão Cunha2019-08-295-76/+68
|/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract duplicated code from two similar classes into a parent one.
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'i18n-extract-app-views-projects-services' into 'master'Rémy Coutable2019-08-298-56/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from 'app/views/projects/services' See merge request gitlab-org/gitlab-ce!32402
| * | | | | | | | | | | | | | | | | | | | | | Externalize strings from 'app/views/projects/services'i18n-extract-app-views-projects-servicesTao Wang2019-08-298-56/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'resolve-new-qa-differences' into 'master'Rémy Coutable2019-08-2919-1/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CE to EE differences in the qa/ directory See merge request gitlab-org/gitlab-ce!32354
| * | | | | | | | | | | | | | | | | | | | | | | Backport EE changes to the qa/ directoryresolve-new-qa-differencesYorick Peterse2019-08-2917-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the qa/ directory uses the X_if_ee methods we can backport all these lines to CE.
| * | | | | | | | | | | | | | | | | | | | | | | Fix InjectEnterpriseEditionModule cop for qa/Yorick Peterse2019-08-282-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the InjectEnterpriseEditionModule cop is able to detect the prepend patterns used in the qa/ directory. Previously it would not detect them as all EE QA modules reside in QA::EE, and not the top-level EE namespace.
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'georgekoltsov/13698-override-params' into 'master'Rémy Coutable2019-08-293-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow project feature permissions to be overridden during import See merge request gitlab-org/gitlab-ce!32348
| * | | | | | | | | | | | | | | | | | | | | | | | Allow project feature permissions to be overridden during importGeorge Koltsov2019-08-293-0/+28
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'renovate/gitlab-packages' into 'master'Clement Ho2019-08-292-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Packages See merge request gitlab-org/gitlab-ce!32285
| * | | | | | | | | | | | | | | | | | | | | | | | Update GitLab PackagesLukas 'Eipi' Eipert2019-08-292-11/+11
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'handle-invalid-mirror-url' into 'master'Nick Thomas2019-08-295-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle invalid mirror url See merge request gitlab-org/gitlab-ce!32353
| * | | | | | | | | | | | | | | | | | | | | | | | Handle invalid mirror urlLee Tickett2019-08-295-1/+17
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-job-webhook-documentation' into 'master'Achilleas Pipinellis2019-08-291-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix job event webhook documentation inconsistency with its actual request body See merge request gitlab-org/gitlab-ce!32390
| * | | | | | | | | | | | | | | | | | | | | | | | Fix job event webhook documentation inconsistency with its actual request bodyBian Jiaping2019-08-291-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-74' into 'master'Achilleas Pipinellis2019-08-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the word 'located' and inserted the word 'at' See merge request gitlab-org/gitlab-ce!32403