summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Merge branch 'security-katex-dos-master' into 'master'GitLab Release Tools Bot2019-08-294-23/+143
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce max chars and max render time in markdown math See merge request gitlab/gitlabhq!3277
| | * | | | | | | | | | | | | | Enforce max chars and max render time in markdown mathMartin Hanzel2019-08-064-23/+143
| | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KaTeX math will now render progressivly and asynchronously. There are upper limits on the character count of each formula, and on cumulative render time.
| * | | | | | | | | | | | | | Merge branch 'security-project-import-bypass' into 'master'GitLab Release Tools Bot2019-08-295-26/+244
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project visibility restriction bypass See merge request gitlab/gitlabhq!3306
| | * | | | | | | | | | | | | | Fix project import restricted visibility bypassGeorge Koltsov2019-08-155-26/+244
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::VisibilityLevelChecker that verifies selected project visibility level (or overridden param) is not restricted when creating or importing a project
| * | | | | | | | | | | | | | Merge branch 'security-hide_merge_request_ids_on_emails' into 'master'GitLab Release Tools Bot2019-08-295-18/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent disclosure of merge request id via email See merge request gitlab/gitlabhq!3313
| | * | | | | | | | | | | | | | Prevent disclosure of merge request id via emailFelipe Artur2019-08-195-18/+89
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not disclosure merge request id via email for unauthorized users when closing issues.
| * | | | | | | | | | | | | | Merge branch 'security-id-filter-timeline-activities-for-guests' into 'master'GitLab Release Tools Bot2019-08-292-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add merge note type as cross reference See merge request gitlab/gitlabhq!3319
| | * | | | | | | | | | | | | | Add merge note type as cross referenceIgor Drozdov2019-08-132-1/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'security-group-runners-permissions' into 'master'GitLab Release Tools Bot2019-08-293-43/+173
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | admin_group authorization for Groups::RunnersController See merge request gitlab/gitlabhq!3325
| | * | | | | | | | | | | | | | | admin_group authorization for Groups::RunnersControllerdrew cimino2019-08-223-43/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use authorize_admin_group! instead of authorize_admin_pipeline! - Added role-based permission specs for Groups::RunnersController
| * | | | | | | | | | | | | | | | Merge branch 'security-ci-metrics-permissions' into 'master'GitLab Release Tools Bot2019-08-293-8/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict MergeRequests#test_reports to authenticated users with read-access on Builds See merge request gitlab/gitlabhq!3329
| | * | | | | | | | | | | | | | | | Restrict MergeRequests#test_reports to authenticated users with read-access ↵drew cimino2019-08-223-8/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Builds
| * | | | | | | | | | | | | | | | | Merge branch 'security-sarcila-fix-weak-session-management' into 'master'GitLab Release Tools Bot2019-08-294-0/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear reset_password_tokens when login (email or username) change See merge request gitlab/gitlabhq!3334
| | * | | | | | | | | | | | | | | | | Add User#will_save_change_to_login? to clear reset_password_tokensSebastian Arcila Valenzuela2019-08-214-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devise checks before updating any of the authentication_keys if it needs to clear the reset_password_tokens. This should fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/42733 (Weak authentication and session management)
| * | | | | | | | | | | | | | | | | | Merge branch 'security-add-job-activity-limit-ce' into 'master'GitLab Release Tools Bot2019-08-295-2/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce JobActivity limit for alive jobs Closes gitlab-ee#376 See merge request gitlab/gitlabhq!3339
| | * | | | | | | | | | | | | | | | | | Add active_jobs_limit to plans tableFabio Pitino2019-08-215-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a port from EE changes where we introduce a new limit for Plan model. https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/1182
| * | | | | | | | | | | | | | | | | | | Merge branch 'security-fix-markdown-xss' into 'master'GitLab Release Tools Bot2019-08-298-13/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-escape the whole HTML content when finding HTML references See merge request gitlab/gitlabhq!3340
| | * | | | | | | | | | | | | | | | | | | Re-escape whole HTML content instead of only matchJan Provaznik2019-08-238-13/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we un-escape HTML text to find references in it, we should then re-escape the whole text again, not only found matches. Because we replace matches with milestone/label links (which contain HTML tags we don't want to escape again), we re-escape HTML text with placeholders instead of these links and then replace placeholders in the escaped text.
| * | | | | | | | | | | | | | | | | | | | Merge branch 'security-exposed-default-branch' into 'master'GitLab Release Tools Bot2019-08-294-2/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid exposing unaccessible repo data upon GFM post processing See merge request gitlab/gitlabhq!3344
| | * | | | | | | | | | | | | | | | | | | | Avoid exposing unaccessible repo data upon GFM processingOswaldo Ferreira2019-08-214-2/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When post-processing relative links to absolute links RelativeLinkFilter didn't take into consideration that internal repository data could be exposed for users that do not have repository access to the project. This commit solves that by checking whether the user can `download_code` at this repository, avoiding any processing of this filter if the user can't. Additionally, if we're processing for a group ( no project was given), we check if the user can read it in order to expand the href as an extra. That doesn't seem necessarily a breach now, but an extra check doesn't hurt as after all the user needs to be able to `read_group`.
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'security-ssrf-kubernetes-dns-12-3' into 'master'GitLab Release Tools Bot2019-08-295-18/+269
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DNS Rebind SSRF in Kubernetes Integration See merge request gitlab/gitlabhq!3345
| | * | | | | | | | | | | | | | | | | | | | | Column was renamed in 12.2Thong Kuah2019-08-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | 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.