summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-fix-pat-web-access' into 'master'Cindy Pallares2018-11-2828-281/+538
* Merge branch 'security-guest-comments' into 'master'Cindy Pallares2018-11-2813-34/+187
* Merge branch 'security-pages-toctou-race' into 'master'Cindy Pallares2018-11-282-1/+7
* Merge branch 'security-xss-in-markdown-following-unrecognized-html-element' i...Cindy Pallares2018-11-285-2/+25
* Merge branch 'security-mermaid-xss' into 'master'Cindy Pallares2018-11-284-1/+21
* Merge branch 'security-bvl-exposure-in-commits-list' into 'master'Cindy Pallares2018-11-283-55/+67
* Merge branch 'security-issue_51301' into 'master'Cindy Pallares2018-11-286-12/+96
* Merge branch 'security-2736-prometheus-ssrf' into 'master'Cindy Pallares2018-11-284-3/+25
* Merge branch 'security-stored-xss-for-environments' into 'master'Cindy Pallares2018-11-286-5/+66
* Merge branch 'security-private-group' into 'master'Cindy Pallares2018-11-283-0/+26
* Merge branch 'security-182-update-workhorse' into 'master'Cindy Pallares2018-11-282-0/+8
* Merge branch 'gt-externalize-app-views-snippets' into 'master'Fatih Acet2018-11-2810-28/+55
|\
| * Externalize strings from `/app/views/snippets`George Tsiolis2018-11-2610-28/+55
* | Merge branch 'tc-improve-add-reference-cop' into 'master'Andreas Brandl2018-11-282-4/+17
|\ \
| * | Make add_reference cop accept a hash for :indexToon Claes2018-11-272-4/+17
* | | Merge branch 'sh-bump-workhorse-7.2.1' into 'master'Nick Thomas2018-11-281-1/+1
|\ \ \
| * | | Bump GitLab Workhorse to 7.2.1Stan Hu2018-11-281-1/+1
* | | | Merge branch 'docs/better-alignment-of-tables' into 'master'Achilleas Pipinellis2018-11-281-48/+48
|\ \ \ \
| * | | | Force better alignment in tablesEvan Read2018-11-281-48/+48
* | | | | Merge branch 'include-new-link-in-breadcrumb' into 'master'Clement Ho2018-11-2814-20/+81
|\ \ \ \ \
| * | | | | Include new and edit links in breadcrumb for project milestones, group milest...George Tsiolis2018-11-2814-20/+81
|/ / / / /
* | | | | Merge branch 'jramsay/improve-resolve-conflicts-docs' into 'master'Achilleas Pipinellis2018-11-282-11/+25
|\ \ \ \ \
| * | | | | Improve detail of resolve conflict docsJames Ramsay2018-11-282-11/+25
* | | | | | Merge branch 'unicorn-monkey-patch' into 'master'Stan Hu2018-11-285-0/+18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add monkey patch to unicorn to fix eof? problemKamil Trzciński2018-11-285-0/+18
* | | | | | Merge branch '38495-calendar-activities-in-timezone' into 'master'Rémy Coutable2018-11-282-1/+6
|\ \ \ \ \ \
| * | | | | | Show user contributions in correct timezone within user profileKushal Pandya2018-11-282-1/+6
|/ / / / / /
* | | | | | Merge branch 'jarv/add-qa-cookies' into 'master'Rémy Coutable2018-11-283-0/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adds QA_COOKIES option to gitlab-qaJohn Jarvis2018-11-283-0/+22
* | | | | | Merge branch 'remove-deployment-status-hack-from-backend' into 'master'Rémy Coutable2018-11-283-17/+20
|\ \ \ \ \ \
| * | | | | | Return real deployment status to frontendShinya Maeda2018-11-283-17/+20
|/ / / / / /
* | | | | | Merge branch '50839-webide-mr-dropdown-filter' into 'master'Phil Hughes2018-11-286-30/+91
|\ \ \ \ \ \
| * | | | | | Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge ...Paul Slaughter2018-11-286-30/+91
|/ / / / / /
* | | | | | Merge branch '54571-runner-tags' into 'master'52888-status-emoji-should-not-be-added-to-awards-section-on-issue-pageKushal Pandya2018-11-286-22/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adds bottom margin to the environment info blockFilipa Lacerda2018-11-283-15/+9
| * | | | | Adds margin between tags when job is stuckFilipa Lacerda2018-11-283-7/+14
* | | | | | Merge branch 'zj-object-pool-path' into 'master'Nick Thomas2018-11-289-20/+83
|\ \ \ \ \ \
| * | | | | | Use #update! over #update to make errors visibleZeger-Jan van de Weg2018-11-281-1/+1
| * | | | | | Rename the Repository table to PoolRepositoryZeger-Jan van de Weg2018-11-279-20/+83
* | | | | | | Merge branch '51061-readme-url-n-1-rpc-call-resolved' into 'master'Douwe Maan2018-11-284-6/+54
|\ \ \ \ \ \ \
| * | | | | | | Resolves N+1 RPC call for Project#readme_urlTiago Botelho2018-11-284-6/+54
* | | | | | | | Merge branch 'check-if-fetched-data-does-is-complete' into 'master'Kamil Trzciński2018-11-283-47/+97
|\ \ \ \ \ \ \ \
| * | | | | | | | Validate chunk size when persistShinya Maeda2018-11-283-47/+97
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/remove-defunct-global-var-reset' into 'master'Grzegorz Bizon2018-11-281-7/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Stop documenting defunct global variables reset.2018-08-311-7/+0
* | | | | | | | | Merge branch '50341-cleanup-useless-project-import-attributes' into 'master'Douwe Maan2018-11-2849-416/+391
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Small code refactoring for condition circuit breaking50341-cleanup-useless-project-import-attributesTiago Botelho2018-11-283-2/+8
| * | | | | | | | | Removes all the irrelevant import related code and columnsTiago Botelho2018-11-2748-416/+385
* | | | | | | | | | Merge branch 'docs/6236-add_security_checks_to_workflow' into 'master'Sean McGivern2018-11-281-12/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Left shift security in our workflowPhilippe Lafoucrière2018-11-281-12/+37
|/ / / / / / / / / /