summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix broken master because of security mergefj-fix-broken-master-url-blockerFrancisco Javier López2019-07-291-5/+2
* Merge branch 'tp-qtt182-7' into 'master'Mayra Cabrera2019-07-292-2/+2
|\
| * Change qa-* class references to rspec-*tp-qtt182-7Tanya Pazitny2019-07-262-2/+2
* | Merge branch 'tp-qtt182-5' into 'master'Mayra Cabrera2019-07-292-3/+3
|\ \
| * | Change qa-full-name to rspec-full-nameTanya Pazitny2019-07-292-3/+3
|/ /
* | Merge branch 'tp-qtt182-8' into 'master'Mayra Cabrera2019-07-294-8/+8
|\ \
| * | Change qa-* class references to rspec-* for repository settingsTanya Pazitny2019-07-294-8/+8
|/ /
* | Merge branch 'tp-qtt182-3' into 'master'Mayra Cabrera2019-07-292-2/+2
|\ \
| * | Change qa-* class references to rspec-*tp-qtt182-3Tanya Pazitny2019-07-262-2/+2
| |/
* | Merge branch 'tp-qtt182-4' into 'master'Mayra Cabrera2019-07-292-2/+2
|\ \
| * | Change qa-* class references to rspec-*tp-qtt182-4Tanya Pazitny2019-07-262-2/+2
| |/
* | Merge branch 'tp-qtt182-2' into 'master'Mayra Cabrera2019-07-292-8/+8
|\ \
| * | Change qa-* class references to rspec-*tp-qtt182-2Tanya Pazitny2019-07-262-8/+8
| |/
* | Merge branch 'ab-add-index-on-environments' into 'master'Mayra Cabrera2019-07-293-1/+24
|\ \
| * | Create index on environments by stateAndreas Brandl2019-07-293-1/+24
|/ /
* | Merge branch 'sh-add-cmaps-for-pdfjs' into 'master'Mike Greiling2019-07-295-47/+107
|\ \
| * | Make pdf.js render CJK characterssh-add-cmaps-for-pdfjsStan Hu2019-07-285-47/+107
* | | Merge branch '11090-export-design-management-1-issue-migration' into 'master'Mayra Cabrera2019-07-296-1/+108
|\ \ \
| * | | Migrations for adding issue_id to versions tableLuke Duncalfe2019-07-296-1/+108
|/ / /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-07-2944-298/+764
|\ \ \
| * | | Update CHANGELOG.md for 11.11.7GitLab Release Tools Bot2019-07-298-35/+15
| * | | Update CHANGELOG.md for 12.1.2GitLab Release Tools Bot2019-07-262-5/+4
| * | | Merge branch 'security-60143-patch-additional-xss-vector-in-wikis' into 'master'GitLab Release Tools Bot2019-07-269-92/+233
| |\ \ \
| | * | | Extract SanitizeNodeLink and apply to WikiLinkFilterKerri Miller2019-07-269-92/+233
| |/ / /
| * | | Merge branch 'security-fix-badges-leaked-to-unauthorized-users' into 'master'GitLab Release Tools Bot2019-07-263-31/+101
| |\ \ \
| | * | | Don't display badges when builds are restrictedFabio Pitino2019-07-113-31/+101
| * | | | Merge branch 'security-github-ssrf-redirect' into 'master'GitLab Release Tools Bot2019-07-266-3/+100
| |\ \ \ \
| | * | | | Do not allow localhost url redirection in GitHub Integrationmanojmj2019-07-056-3/+100
| * | | | | Merge branch 'security-remove-take-trigger-ownership-feature' into 'master'GitLab Release Tools Bot2019-07-2611-141/+9
| |\ \ \ \ \
| | * | | | | Drop feature to take ownership of a trigger tokenFabio Pitino2019-07-1011-141/+9
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'security-mr-pipeline-permissions' into 'master'GitLab Release Tools Bot2019-07-264-6/+102
| |\ \ \ \ \
| | * | | | | Use MergeRequest#source_project as permissions reference for MergeRequest#all...drew cimino2019-07-054-6/+102
| * | | | | | Merge branch 'security-dns-ssrf-bypass' into 'master'GitLab Release Tools Bot2019-07-264-14/+49
| |\ \ \ \ \ \
| | * | | | | | Fix Server Side Request Forgery mitigation bypassFrancisco Javier López2019-07-154-14/+49
| * | | | | | | Merge branch 'security-60551-fix-upload-scope' into 'master'GitLab Release Tools Bot2019-07-267-2/+48
| |\ \ \ \ \ \ \
| | * | | | | | | Queries for Upload should be scoped by modelAdam Hegyi2019-07-117-2/+48
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'security-hide_moved_issue_id' into 'master'GitLab Release Tools Bot2019-07-263-1/+44
| |\ \ \ \ \ \ \
| | * | | | | | | Do not show moved issue ids for user not authorizedFelipe Artur2019-07-113-1/+44
| | |/ / / / / /
| * | | | | | | Merge branch 'security-bvl-filter-mr-params' into 'master'GitLab Release Tools Bot2019-07-264-8/+83
| |\ \ \ \ \ \ \
| | * | | | | | | Filter params in MR build serviceBob Van Landuyt2019-07-174-8/+83
| * | | | | | | | Update CHANGELOG.md for 12.1.2GitLab Release Tools Bot2019-07-251-0/+15
* | | | | | | | | Merge branch 'sh-fix-pdfjs-page-ordering' into 'master'Mike Greiling2019-07-293-9/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplify pdf.js logicsh-fix-pdfjs-page-orderingLukas Eipert2019-07-292-15/+11
| * | | | | | | | | Fix pdf.js rendering pages in the wrong orderStan Hu2019-07-292-1/+12
* | | | | | | | | | Merge branch 'resolve-spec-differences' into 'master'Lin Jen-Shin2019-07-295-9/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix whitespace in wiki link filtering specsresolve-spec-differencesYorick Peterse2019-07-291-1/+1
| * | | | | | | | | | Make usage content spec the same for CE and EEYorick Peterse2019-07-291-1/+9
| * | | | | | | | | | Make protected tags spec the same for CE and EEYorick Peterse2019-07-291-0/+6
| * | | | | | | | | | Backport ToDo feature specs from EEYorick Peterse2019-07-291-7/+35
| * | | | | | | | | | Backport EE changes for the schema specsYorick Peterse2019-07-291-0/+2