summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flagHeinrich Lee Yu2019-04-037-146/+36
* Merge branch '59131-set-the-size-of-instance-system-message-text-12px' into '...Mike Greiling2019-04-023-1/+6
|\
| * Remove duplicate declaration of $system-header-height59131-set-the-size-of-instance-system-message-text-12pxDennis Tang2019-04-021-1/+0
| * Update system message banner font size to 12pxDennis Tang2019-04-022-0/+6
* | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Clement Ho2019-04-022-5/+5
|\ \
| * | Update dependency @gitlab/svgs to ^1.58.0Lukas 'Eipi' Eipert2019-04-022-5/+5
* | | Merge branch 'qa-increase-depth-of-review-deploy-job' into 'master'Douglas Barbosa Alexandre2019-04-021-2/+0
|\ \ \
| * | | Use the default fetch/clone depth for the review-deploy jobqa-increase-depth-of-review-deploy-jobRémy Coutable2019-04-021-2/+0
* | | | Merge branch '55980-remove-add-issue-on-blank-list' into 'master'Clement Ho2019-04-024-2/+24
|\ \ \ \
| * | | | Remove non-functional add issue button on welcome listDonald Cook2019-04-024-2/+24
|/ / / /
* | | | Merge branch 'revert-a3fd1a13' into 'master'Robert Speicher2019-04-024-84/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"Jan Provaznik2019-04-024-84/+0
|/ / /
* | | Merge branch 'docs-revamp-ci-variables' into 'master'Marcia Ramos2019-04-026-236/+376
|\ \ \
| * | | Add screenshots for variablesMarcia Ramos2019-04-026-236/+376
|/ / /
* | | Merge branch 'if-53411-remove_ignore_column' into 'master'Kamil Trzciński2019-04-021-2/+0
|\ \ \
| * | | Remove ignore column for PersonalAccessToken#tokenImre Farkas2019-04-021-2/+0
|/ / /
* | | Merge branch 'ce-8317-operations-dashboard-usage-ping' into 'master'Douglas Barbosa Alexandre2019-04-021-0/+1
|\ \ \
| * | | Add with_dashboard scope to Userce-8317-operations-dashboard-usage-pingLogan King2019-03-221-0/+1
* | | | 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
| | |\ \ \ \ \ \ \ \