summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow to include templatesinclude-templatesKamil Trzciński2019-01-0416-65/+472
* Merge branch '55369-update-milestone-sort-to-say-say-milestone-due-date' into...Sean McGivern2019-01-023-2/+7
|\
| * Renames Milestone sort into Milestone due dateJacopo2018-12-313-2/+7
* | Merge branch 's3-directories-get' into 'master'Kamil Trzciński2019-01-023-2/+8
|\ \
| * | Use directories.new when getting S3 directoryJan Provaznik2018-12-273-2/+8
* | | Merge branch '55755-user-activity-is-stuck-loading-when-there-is-none' into '...Kushal Pandya2019-01-025-7/+24
|\ \ \
| * | | Resolve "User activity is stuck loading when there is none"Martin Wortschack2019-01-025-7/+24
|/ / /
* | | Merge branch 'sh-bump-qa-image-ruby-2.5' into 'master'Grzegorz Bizon2019-01-021-1/+1
|\ \ \
| * | | Upgrade GitLab QA image to Ruby 2.5Stan Hu2018-12-311-1/+1
* | | | Merge branch '55838-remove-gem-install-bundler-from-docker-based-ruby-environ...Sean McGivern2019-01-0212-13/+8
|\ \ \ \
| * | | | Remove gem install bundler from Docker-based Ruby environmentsTakuya Noguchi2019-01-0112-13/+8
* | | | | Merge branch 'qa-fix-logging-find-element' into 'master'Ramya Authappan2019-01-022-2/+14
|\ \ \ \ \
| * | | | | Log text_filter arg of find_elementMark Lapierre2018-12-282-2/+14
* | | | | | Merge branch 'patch-37' into 'master'Evan Read2019-01-021-1/+1
|\ \ \ \ \ \
| * | | | | | Updating link to correctly point to environment scope docsGareth Davies2018-12-251-1/+1
* | | | | | | Merge branch 'patch-37' into 'master'Evan Read2019-01-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Update mysql.mdsofiane belaribi2018-12-211-2/+2
* | | | | | | | Merge branch '53656-explain-how-to-add-custom-kaniko-certificate' into 'master'Evan Read2019-01-011-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Explain how to use kaniko with a registry with a custom certificateRaphael Nestler2018-12-211-0/+23
* | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-0141-78/+620
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'security-53543-user-keeps-access-to-mr-issue-when-removed-from-...John Jarvis2019-01-016-3/+77
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Adds validation to check if user can read projectTiago Botelho2018-12-196-3/+77
| * | | | | | | | | Merge branch 'security-bvl-fix-cross-project-mr-exposure' into 'master'John Jarvis2019-01-014-10/+111
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Validate projects in MR build serviceBob Van Landuyt2018-12-144-10/+111
| * | | | | | | | | | Merge branch 'security-refs-available-to-project-guest' into 'master'John Jarvis2019-01-013-4/+26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Project guests no longer are able to see refs pageTiago Botelho2018-12-193-4/+26
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'security-fix-ssrf-import-url-remote-mirror' into 'master'John Jarvis2019-01-015-5/+30
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Replaced UrlValidator with PublicUrlValidator for import_url and remote mirro...Francisco Javier López2018-12-135-5/+30
| * | | | | | | | | | | Merge branch 'security-48259-private-snippet' into 'master'John Jarvis2019-01-019-11/+123
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Block private snippets from being embeddableMark Chao2018-12-206-7/+82
| | * | | | | | | | | | | Move embeddable? to model to be used outside viewMark Chao2018-12-204-9/+46
| * | | | | | | | | | | | Merge branch 'security-54377-label-milestone-name-xss' into 'master'John Jarvis2019-01-013-7/+59
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add changelog entryKushal Pandya2018-12-201-0/+5
| | * | | | | | | | | | | | Escape label and milestone titles to prevent XSSKushal Pandya2018-12-202-7/+54
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'security-master-guests-jobs-api' into 'master'John Jarvis2019-01-013-6/+36
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add CHANGELOG entryMatija Čupić2018-12-221-0/+5
| | * | | | | | | | | | | | Move pipeline auth above pipeline assignmentMatija Čupić2018-12-201-1/+1
| | * | | | | | | | | | | | Authorize read_pipeline before read_buildMatija Čupić2018-12-191-0/+1
| | * | | | | | | | | | | | Authorize read_build when listing pipeline jobsMatija Čupić2018-12-192-3/+15
| | * | | | | | | | | | | | Authorize read_build action when listing jobsMatija Čupić2018-12-192-3/+15
| * | | | | | | | | | | | | Merge branch 'security-fix-ssrf-lfs-project-import' into 'master'John Jarvis2019-01-012-17/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed SSRF in project imports with LFSFrancisco Javier López2018-12-182-17/+77
| * | | | | | | | | | | | | | Merge branch 'security-master-group-cicd-settings-accessible-to-maintainer' i...John Jarvis2019-01-015-15/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add CHANGELOG entryMatija Čupić2018-12-241-0/+5
| | * | | | | | | | | | | | | | Check for group admin permissionsMatija Čupić2018-12-204-15/+51
| * | | | | | | | | | | | | | | Update CHANGELOG.md for 11.6.1GitLab Release Tools Bot2018-12-281-0/+25
* | | | | | | | | | | | | | | | Merge branch 'patch-37' into 'master'Sean McGivern2019-01-0138-38/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Stop using deprecated argument to `gem`Sean McGivern2019-01-011-1/+1
| * | | | | | | | | | | | | | | | Update doc/update/9.5-to-10.0.mdFatih Sarhan2018-12-311-1/+1
| * | | | | | | | | | | | | | | | Update doc/update/9.4-to-9.5.mdFatih Sarhan2018-12-311-1/+1