summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove :kubernetes_namespace_per_environment feature flag66139-remove-kubernetes_namespace_per_environment-feature-flagTiger2019-08-301-1/+1
* URL-encode file links in find fileJan Beckmann2019-08-301-1/+1
* Allow be_url to specify the typeAlex Kalderimis2019-08-301-5/+5
* Merge branch 'ce-backport-of-ml-web-terminal-spec-qa' into 'master'Dan Davison2019-08-292-2/+3
|\
| * Backport changes from EEce-backport-of-ml-web-terminal-spec-qaMark Lapierre2019-08-292-2/+3
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-2932-73/+341
|\ \
| * \ Merge branch 'security-enable-image-proxy' into 'master'GitLab Release Tools Bot2019-08-294-9/+55
| |\ \
| | * | Add support for using a Camo proxy serverBrett Walker2019-08-234-9/+55
| * | | Merge branch 'security-2853-prevent-comments-on-private-mrs' into 'master'GitLab Release Tools Bot2019-08-292-4/+11
| |\ \ \
| | * | | Prevent unauthorised comments on merge requestsAlex Kalderimis2019-08-072-4/+11
| * | | | Merge branch 'security-epic-notes-api-reveals-historical-info-ce-master' into...GitLab Release Tools Bot2019-08-294-2/+8
| |\ \ \ \
| | * | | | Return NO_ACCESS if user is nilPatrick Derichs2019-08-281-0/+2
| | * | | | Filter out old system notes for epicsPatrick Derichs2019-08-283-2/+6
| * | | | | Merge branch 'security-personal-snippets' into 'master'GitLab Release Tools Bot2019-08-293-2/+12
| |\ \ \ \ \
| | * | | | | Add direct upload support for personal snippetsJan Provaznik2019-08-233-2/+12
| * | | | | | Merge branch 'security-fix-html-injection-for-label-description-ce-master' in...GitLab Release Tools Bot2019-08-292-3/+7
| |\ \ \ \ \ \
| | * | | | | | Fix HTML injection for label descriptionPatrick Derichs2019-08-052-3/+7
| * | | | | | | Merge branch 'security-fix_jira_ssrf_vulnerability' into 'master'GitLab Release Tools Bot2019-08-291-1/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Fix DNS rebind vulnerability for JIRA integrationFelipe Artur2019-08-081-1/+6
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'security-61974-limit-issue-comment-size' into 'master'GitLab Release Tools Bot2019-08-292-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Limit the size of issuable description and commentsAlexandru Croitor2019-08-222-0/+2
| * | | | | | | | Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'GitLab Release Tools Bot2019-08-297-11/+62
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add captcha if there are multiple failed login attemptsMaƂgorzata Ksionek2019-07-317-11/+62
| * | | | | | | | | Merge branch 'security-mr-head-pipeline-leak' into 'master'GitLab Release Tools Bot2019-08-291-1/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Permission fix for MergeRequestsController#pipeline_statusdrew cimino2019-08-121-1/+8
| * | | | | | | | | | Merge branch 'security-katex-dos-master' into 'master'GitLab Release Tools Bot2019-08-291-18/+128
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Enforce max chars and max render time in markdown mathMartin Hanzel2019-08-061-18/+128
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'security-project-import-bypass' into 'master'GitLab Release Tools Bot2019-08-291-11/+16
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix project import restricted visibility bypassGeorge Koltsov2019-08-151-11/+16
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'security-hide_merge_request_ids_on_emails' into 'master'GitLab Release Tools Bot2019-08-292-0/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Prevent disclosure of merge request id via emailFelipe Artur2019-08-192-0/+6
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'security-id-filter-timeline-activities-for-guests' into 'master'GitLab Release Tools Bot2019-08-291-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add merge note type as cross referenceIgor Drozdov2019-08-131-1/+1
| * | | | | | | | | | | Merge branch 'security-group-runners-permissions' into 'master'GitLab Release Tools Bot2019-08-291-5/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | admin_group authorization for Groups::RunnersControllerdrew cimino2019-08-221-5/+1
| * | | | | | | | | | | | Merge branch 'security-ci-metrics-permissions' into 'master'GitLab Release Tools Bot2019-08-291-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Restrict MergeRequests#test_reports to authenticated users with read-access o...drew cimino2019-08-221-0/+6
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'security-sarcila-fix-weak-session-management' into 'master'GitLab Release Tools Bot2019-08-291-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add User#will_save_change_to_login? to clear reset_password_tokensSebastian Arcila Valenzuela2019-08-211-0/+7
| * | | | | | | | | | | | | Merge branch 'security-add-job-activity-limit-ce' into 'master'GitLab Release Tools Bot2019-08-292-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add active_jobs_limit to plans tableFabio Pitino2019-08-212-1/+3
| * | | | | | | | | | | | | | Merge branch 'security-64711-fix-commit-todos' into 'master'GitLab Release Tools Bot2019-08-291-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Send TODOs for comments on commits correctlyNick Thomas2019-08-231-4/+2
* | | | | | | | | | | | | | | Merge branch 'sh-add-delete-confirmation' into 'master'Michael Kozono2019-08-295-6/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Make it harder to delete issuables accidentallyStan Hu2019-08-295-6/+34
* | | | | | | | | | | | | | | | fix: show preferred commit email in empty project pageYuping Zuo2019-08-291-1/+1
* | | | | | | | | | | | | | | | Merge branch 'tc-cleanup-issue-created-text-mail' into 'master'Mike Greiling2019-08-292-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Bring text mail for new issue & MR more in linetc-cleanup-issue-created-text-mailToon Claes2019-08-272-9/+5
* | | | | | | | | | | | | | | | | Merge branch 'revert-64251-branch-cache' into 'master'Stan Hu2019-08-291-8/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Revert "Cache branch and tag names as Redis sets"Nick Thomas2019-08-291-8/+4