summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix quick actions add label name middle word overlaps53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-labelJacopo2019-04-024-4/+63
* Merge branch 'ce-reduce-diff-in-spec-models' into 'master'Lin Jen-Shin2019-04-025-7/+42
|\
| * [CE] Reduce diff with EE in spec/models/project_wiki_spec.rbce-reduce-diff-in-spec-modelsRémy Coutable2019-04-021-1/+0
| * [CE] Reduce diff with EE in spec/models/project_team_spec.rbRémy Coutable2019-04-021-0/+24
| * [CE] Reduce diff with EE in spec/models/project_spec.rbRémy Coutable2019-04-021-0/+9
| * [CE] Reduce diff with EE in spec/models/environment_spec.rbRémy Coutable2019-04-021-1/+3
| * [CE] Reduce diff with EE in spec/models/concerns/prometheus_adapter_spec.rbRémy Coutable2019-04-021-5/+6
* | Merge branch 'ce-6119-extract-ee-specific-files-lines-for-spec-services-group...Lin Jen-Shin2019-04-021-38/+0
|\ \
| * | Remove groups destroy race condition specce-6119-extract-ee-specific-files-lines-for-spec-services-groupsSean McGivern2019-04-021-38/+0
* | | Merge branch 'sh-cache-pipeline-find-commits' into 'master'Kamil Trzciński2019-04-023-4/+17
|\ \ \
| * | | Cache FindCommit results in pipelines viewsh-cache-pipeline-find-commitsStan Hu2019-04-023-4/+17
* | | | Merge branch 'docs-image-realignment' into 'master'11-10-stable-prepare-rc1Achilleas Pipinellis2019-04-0235-0/+0
|\ \ \ \
| * | | | Docs: image realignmentMarcel Amirault2019-04-0235-0/+0
|/ / / /
* | | | Merge branch 'docs-move-variables-ref-to-new-doc' into 'master'Achilleas Pipinellis2019-04-022-101/+111
|\ \ \ \
| * | | | Fix conflicts with masterMarcia Ramos2019-04-022-101/+111
|/ / / /
* | | | Merge branch 'jv-gitaly-unlink-repository' into 'master'Grzegorz Bizon2019-04-025-19/+6
|\ \ \ \
| * | | | Stop calling UnlinkRepositoryFromObjectPool RPCJacob Vosmaer2019-04-025-19/+6
|/ / / /
* | | | Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'Robert Speicher2019-04-0263-32302/+52008
|\ \ \ \
| * \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitl...jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-0263-32302/+52008
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'security-exif-migration' into 'master'GitLab Release Tools Bot2019-04-027-1/+363
| | |\ \ \
| | | * | | Rake task for removing exif from uploadsJan Provaznik2019-04-027-1/+363
| | |/ / /
| | * | | Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'GitLab Release Tools Bot2019-04-023-1/+21
| | |\ \ \
| | | * | | Fix XSS in resolve conflicts formPaul Slaughter2019-03-073-1/+21
| | * | | | Merge branch 'security-56224' into 'master'GitLab Release Tools Bot2019-04-025-4/+47
| | |\ \ \ \
| | | * | | | Hide related branches when user does not have permissionMark Chao2019-03-215-4/+47
| | * | | | | Merge branch 'security-id-potential-denial-languages' into 'master'GitLab Release Tools Bot2019-04-0213-18/+130
| | |\ \ \ \ \
| | | * | | | | Return cached languages if they've been detected beforeIgor Drozdov2019-03-2013-18/+130
| | * | | | | | Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'GitLab Release Tools Bot2019-04-028-32169/+50870
| | |\ \ \ \ \ \
| | | * | | | | | Added changelog entryNatalia Tepluhina2019-03-191-0/+5
| | | * | | | | | Fixed pdf testsNatalia Tepluhina2019-03-132-3/+3
| | | * | | | | | fix: changed PDFJS prop to GlobalWorkerOptionsNatalia Tepluhina2019-03-131-1/+1
| | | * | | | | | Updated PDF.js to 2.0.943Natalia Tepluhina2019-03-124-32165/+50861
| | * | | | | | | Merge branch 'security-use-untrusted-regexp' into 'master'GitLab Release Tools Bot2019-04-0215-96/+198
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make CI refs matching to to use UntrustedRegexpKamil Trzciński2019-03-1515-96/+198
| | * | | | | | | | Merge branch 'security-milestone-labels' into 'master'GitLab Release Tools Bot2019-04-024-8/+162
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Check if labels are available for target issuableJarka Košanová2019-03-284-8/+162
| | * | | | | | | | | Merge branch 'security-mass-assignment-on-project-update' into 'master'GitLab Release Tools Bot2019-04-023-5/+30
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Refactor specs according to the code reviewMałgorzata Ksionek2019-03-261-1/+1
| | | * | | | | | | | | Add cr remarksMałgorzata Ksionek2019-03-253-5/+5
| | | * | | | | | | | | Disallow changing namespace of a project in update methodMałgorzata Ksionek2019-03-203-5/+30
| | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'security-disallow-guests-to-access-releases' into 'master'GitLab Release Tools Bot2019-04-024-3/+46
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Disallow guest users from accessing ReleasesShinya Maeda2019-03-264-3/+46
| | * | | | | | | | | | Update CHANGELOG.md for 11.7.10GitLab Release Tools Bot2019-03-281-0/+13
| | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Update CHANGELOG.md for 11.9.3GitLab Release Tools Bot2019-03-271-0/+14
| | * | | | | | | | | Update CHANGELOG.md for 11.7.8GitLab Release Tools Bot2019-03-261-0/+13
| | * | | | | | | | | Update CHANGELOG.md for 11.9.2GitLab Release Tools Bot2019-03-261-0/+14
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'qa/document_click_vs_go_to' into 'master'Rémy Coutable2019-04-022-0/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document click_ vs. go_to_ standard for e2e testsqa/document_click_vs_go_toWalmyr Lima2019-04-012-0/+47
* | | | | | | | | | | Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'Kamil Trzciński2019-04-026-50/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport EE changeexpose-mr-pipeline-parameters-for-merge-widget-ceShinya Maeda2019-04-026-50/+17