summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-acet-issue-details' into 'master'Bob Van Landuyt2018-10-012-4/+6
|\
| * Properly sanitize JSON data to fix XSS on Issue details page.Fatih Acet2018-09-112-4/+6
* | Merge branch 'security-package-json-xss' into 'master'Bob Van Landuyt2018-10-011-1/+2
|\ \
| * | Fix xss vulnerability sourced from package.json's homepageMark Chao2018-09-191-1/+2
* | | Merge branch 'security-6881-project-group-approvers-leaks-private-group-info-...Bob Van Landuyt2018-10-0113-29/+67
|\ \ \
| * | | Ports new refactor from EE to CETiago Botelho2018-09-245-5/+17
| * | | Applies the CE backport of EE#657Tiago Botelho2018-09-2410-24/+50
* | | | [master] Stored XSS in Gitlab Merge Request from imported repositoryFrancisco Javier López2018-10-011-1/+1
* | | | Merge branch 'security-gcp-token-exposed-by-kubernetes' into 'master'Bob Van Landuyt2018-10-012-7/+7
|\ \ \ \
| * | | | Do not persist errors from Kubernetes callsMayra Cabrera2018-09-172-7/+7
* | | | | Merge branch 'fix-events-finder-incomplete' into 'master'Bob Van Landuyt2018-10-013-1/+15
|\ \ \ \ \
| * | | | | Check snippet note event visibilityNick Thomas2018-09-211-0/+12
| * | | | | Fix Event#visible_to_user? for milestonesNick Thomas2018-09-211-1/+1
| * | | | | Redact events shown in the events APINick Thomas2018-09-212-0/+2
* | | | | | Merge branch 'rename-squash-before-merge-vue-component' into 'master'Phil Hughes2018-09-264-17/+2
|\ \ \ \ \ \
| * | | | | | Rename squash before merge vue componentGeorge Tsiolis2018-09-214-17/+2
* | | | | | | Merge branch 'frozen-string-app-controllers-much-more' into 'master'Rémy Coutable2018-09-2688-12/+178
|\ \ \ \ \ \ \
| * | | | | | | Enable even more frozen string in app/controllersgfyoung2018-09-2588-12/+178
* | | | | | | | Preserve order of project tags listDennis Tang2018-09-262-2/+2
* | | | | | | | Resolve "Commit details are not displayed when reviewing an MR commit by commit"Paul Slaughter2018-09-268-7/+193
* | | | | | | | Merge branch 'patch-28' into 'master'Phil Hughes2018-09-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix board list vertical scroll bar always shows upEmeryao2018-07-091-1/+1
* | | | | | | | Add link component from gitlab-uiJose Ivan Vargas2018-09-252-8/+17
* | | | | | | | Add gitlab-ui skeleton loadingClement Ho2018-09-258-106/+27
* | | | | | | | Merge branch 'frozen-string-app-controller-more' into 'master'Stan Hu2018-09-2551-1/+103
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable more frozen string in app/controllers/gfyoung2018-09-2351-1/+103
* | | | | | | | | Merge branch 'follow-up-geo-sync-disabled-wikis' into 'master'Douglas Barbosa Alexandre2018-09-253-33/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Geo: sync disabled wikis. Stage 2follow-up-geo-sync-disabled-wikisValery Sizov2018-09-253-33/+2
* | | | | | | | | | Merge branch 'fix-committer-typo' into 'master'Rémy Coutable2018-09-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix committer typoGeorge Tsiolis2018-09-251-1/+1
* | | | | | | | | | | Merge branch 'leipert-fix-mr-widget-header-margins' into 'master'Annabel Dunstone Gray2018-09-251-25/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix merge request header marginsleipert-fix-mr-widget-header-marginsLukas Eipert2018-09-251-25/+35
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fa-handle_invalid_utf8_errors' into 'master'Stan Hu2018-09-253-0/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Render 412 for invalid UTF-8 parametersfa-handle_invalid_utf8_errorsFelipe Artur2018-09-223-0/+34
* | | | | | | | | | | | Merge branch 'ml-qa-register-ldap' into 'master'Dan Davison2018-09-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow registration when LDAP is enabledml-qa-register-ldapMark Lapierre2018-09-241-1/+1
* | | | | | | | | | | | | Merge branch 'ide-remove-stage-buttons' into 'master'Filipa Lacerda2018-09-252-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed alignment of changed icon in commit headide-remove-stage-buttonsPhil Hughes2018-09-251-0/+1
| * | | | | | | | | | | | | Remove stage/unstage buttons from IDE commit list itemsPhil Hughes2018-09-201-4/+0
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Cleanup polling of merge request widget in testsWinnie Hellmann2018-09-251-0/+2
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ce-7013-add-epics-close-support' into 'master'Douglas Barbosa Alexandre2018-09-253-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bacport FE changes from Closing Epicsce-7013-add-epics-close-supportJarka Košanová2018-09-243-1/+20
* | | | | | | | | | | | | Merge branch 'mk/improve-usage-of-request-store' into 'master'Yorick Peterse2018-09-257-26/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use `Gitlab::SafeRequestStore` in more placesMichael Kozono2018-09-243-6/+6
| * | | | | | | | | | | | | Simplify by using Gitlab::SafeRequestStoreMichael Kozono2018-09-244-20/+4
* | | | | | | | | | | | | | Merge branch 'deploy-tokens' into 'master'Rémy Coutable2018-09-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | use redirect instead of render to avoid creating keys when refresh - resolves...Muhammad Nuzaihan2018-07-041-2/+2
* | | | | | | | | | | | | | Merge branch 'ide-refactor-for-ee-specific' into 'master'Phil Hughes2018-09-252-9/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Refactor IDE index to support EE specific codePaul Slaughter2018-09-242-9/+31
* | | | | | | | | | | | | | | Use Vue component for job artifacts, Commit and Trigger VariablesFilipa Lacerda2018-09-257-245/+187