Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2019-03-26Merge branch 'security-55503-fix-pdf-js-11-9' into '11-9-stable'Yorick Peterse
Fix PDF.js vulnerability See merge request gitlab/gitlabhq!3024
2019-03-26Merge branch 'security-mass-assignment-on-project-update-11-9' into ↵Yorick Peterse
'11-9-stable' Disallow changing namespace of a project in update method See merge request gitlab/gitlabhq!3033
2019-03-26Merge branch 'security-id-potential-denial-languages-11-9' into '11-9-stable'GitLab Release Tools Bot
Return cached languages if they've been detected before See merge request gitlab/gitlabhq!3029
2019-03-26Merge branch 'security-2819-xss-resolve-conflicts-branch-name-11-9' into ↵GitLab Release Tools Bot
'11-9-stable' Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!3030
2019-03-26Merge branch 'security-milestone-labels-11-9' into '11-9-stable'GitLab Release Tools Bot
Check label_ids parent when updating issue board See merge request gitlab/gitlabhq!3035
2019-03-26Merge branch 'security-56224-11-9' into '11-9-stable'GitLab Release Tools Bot
Fix related branches visible in issues for guests See merge request gitlab/gitlabhq!3018
2019-03-26Disallow guest users from accessing ReleasesShinya Maeda
As they do not have a permission to read git tag
2019-03-25Merge branch 'refresh-commit-count-after-head-change' into 'master'Stan Hu
Refresh commit count after repository head changes Closes #59346 See merge request gitlab-org/gitlab-ce!26473 (cherry picked from commit 7ffc79829194d3be18cf66017528a90b41586054) e64589a3 Refresh commit count after repository head changes
2019-03-25Merge branch '59289-fix-push-to-create-protected-branches' into 'master'Douwe Maan
Allow users to create protected branches via CLI Closes #59289 See merge request gitlab-org/gitlab-ce!26413 (cherry picked from commit b36fc6d51d7b70b25be62d3e6a1a2da616975770) 438485ef Allow users to create protected branches via CLI
2019-03-25Merge branch '59147-duplicate-match-line' into 'master'Douwe Maan
Fix duplicated bottom match line Closes #59147 See merge request gitlab-org/gitlab-ce!26402 (cherry picked from commit 7d3c5d882c1ddb7a78241e326996f30d67fce4b8) 8723f292 Fix diff bottom expand button appears twice
2019-03-25Merge branch '59208-add-option-to-keep-cached-fields-during-serialization' ↵Stan Hu
into 'master' Add option to whitelist _html fields from attributes on CacheMarkdownField See merge request gitlab-org/gitlab-ce!26374 (cherry picked from commit f7fcfc7720c5149e2fa6f027900503ae3f215bf1) 3fd8e612 Add option to not exclude _html fields from attributes bcc988a6 Does not exclude message_html from attributes 69dc893d Fix spec for Gitlab::JsonCache 6264694d Rename the hidden option to whitelisted
2019-03-25Merge branch '58999-z-index-issue-on-pipeline-dropdown' into 'master'Phil Hughes
Resolve "Z-Index Issue on Pipeline Dropdown" Closes #58999 See merge request gitlab-org/gitlab-ce!26274 (cherry picked from commit 9023cf710cb161360e5cda97ea2746cb66385092) 9b777688 Fix z-index issue
2019-03-25Add cr remarksMałgorzata Ksionek
2019-03-25Check if labels are available for target issuableJarka Košanová
- labels have to be in the same project/group as an issuable
2019-03-21Disallow changing namespace of a project in update methodMałgorzata Ksionek
2019-03-21Fix XSS in resolve conflicts formPaul Slaughter
The issue arose when the branch name contained Vue template JavaScript. The fix is to use `v-pre` which disables Vue compilation in a template.
2019-03-21Merge remote-tracking branch 'dev/11-9-stable' into 11-9-stableAlex Hanselka
* dev/11-9-stable: Update VERSION to 11.9.0-rc9 Only return `commands_changes` used in frontend
2019-03-21Merge branch 'winh-replty-to-comment-tooltip' into 'master'Clement Ho
Move reply to comment tooltip to the top Closes #59198 See merge request gitlab-org/gitlab-ce!26366 (cherry picked from commit 75e24b8f506444bfdac57fd0d8d691e49fb77dc1) 6f4c0178 Move reply to comment tooltip to the top
2019-03-20Return cached languages if they've been detected beforeIgor Drozdov
2019-03-20Updated PDF.js to 2.0.943Natalia Tepluhina
fix: changed PDFJS prop to GlobalWorkerOptions Fixed pdf tests Added changelog entry
2019-03-20Merge branch 'security-11-9-2826-fix-project-serialization-in-quick-actions' ↵John Jarvis
into '11-9-stable' Fix project serialization in quick actions response See merge request gitlab/gitlabhq!3015
2019-03-20Hide related branches when user does not have permissionMark Chao
Guest user of a project should not see branches
2019-03-19Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master'Phil Hughes
Resolve "Merge request page loses state" See merge request gitlab-org/gitlab-ce!25988
2019-03-19Revert "Merge branch '7861-cross-project-pipeline-dashboard-mvc-ce-backport' ↵John Jarvis
into 'master'" This reverts commit 99b813ddcd51c125b342fe6b8d2a847a84993621, reversing changes made to bc6cc878d9c82a221c55e08f62a7bec200b7392b.
2019-03-19Merge branch '7861-cross-project-pipeline-dashboard-mvc-ce-backport' into ↵Filipa Lacerda
'master' Backport EE CSS addition See merge request gitlab-org/gitlab-ce!25874
2019-03-19Merge branch 'sh-fix-ssh-pull-mirorrs-ce' into 'master'Nick Thomas
Backport EE JavaScript changes for SSH pull mirrors Closes #56340 See merge request gitlab-org/gitlab-ce!26308
2019-03-19Merge branch 'fix-projects-partial-locals' into 'master'Stan Hu
Fix undefined variable error on json project views See merge request gitlab-org/gitlab-ce!26297 (cherry picked from commit 3c5a81cb83e6022530e53b1b6cdedf94c92d980e) 585fcfb9 Fix undefined variable error on json project views
2019-03-19Merge branch 'id-skip-prepopulating-for-any-none' into 'master'Phil Hughes
Fix skipping of user rendering for none and any See merge request gitlab-org/gitlab-ce!26268 (cherry picked from commit 142c39aee6e0e3fb8e73d6eb818e49ef7795cfc4) 4eb70b90 Fix skipping of user rendering for none and any
2019-03-19Merge branch 'make-tokens-encryption-optional-for-now' into 'master'Grzegorz Bizon
Make runners token encryption to be optional See merge request gitlab-org/gitlab-ce!26223 (cherry picked from commit bfe4bdccc12f01bd33420f3e252a583c7fc0bb53) 851697a8 Make runners token encryption to be optional
2019-03-19Merge branch 'sh-handle-null-bytes-in-merge-request-diffs' into 'master'Nick Thomas
Fix error creating a merge request when diff includes a null byte Closes #57710 See merge request gitlab-org/gitlab-ce!26190 (cherry picked from commit a885e2d0a63b25411995fce2057067348f1bad9b) 6552197e Fix error creating a merge request when diff includes a null byte
2019-03-19Merge branch '57330-fix-comment-edited' into 'master'Sean McGivern
Hide "Edited" when note is transformed or resolved Closes #57330 See merge request gitlab-org/gitlab-ce!26143 (cherry picked from commit 6461cbdfa4df0873d62183ca0c0979b20040fde6) f5f243a0 Hide "Edited" when note is transformed or resolved
2019-03-19Merge branch 'psimyn-incident-report-section-ce' into 'master'Mike Greiling
CE backport of Add Incidents section to Operations settings See merge request gitlab-org/gitlab-ce!25939 (cherry picked from commit 11c8b5a18b6bfc822042d0748dcb6b04f11c1337) f87517e0 Add Incidents section to Operations settings a28742ad Add feature specs for settings page
2019-03-19Merge branch '4925-open-issues-based-on-prometheus-alerts-controller-ce' ↵Kamil Trzciński
into 'master' Remove unnecessary license check in operations controller See merge request gitlab-org/gitlab-ce!25728 (cherry picked from commit 6648188121ba8c044f104ff491a3b20a53167c64) 44f3dc5b Remove unnecessary license check
2019-03-18Only return `commands_changes` used in frontendHeinrich Lee Yu
When executing quick actions, this limits the `commands_changes` response to only those used by the frontend
2019-03-15Merge branch 'fj-58804-fix-bitbucket-import' into 'master'Douwe Maan
Fix Bitbucket import Closes #58804 See merge request gitlab-org/gitlab-ce!26050 (cherry picked from commit 516987e4ba40bffa68a1060efd901af2f1e6a3c3) e4663942 Fix Bitbucket import a89851e7 Added changelog to MR b5b9925e Removing SHA length validation 4268fc87 Added SHA length validation 2e2e3a8c Small replacement in spec to use a constant
2019-03-14Merge branch '48324-enable-squash-message-on-fast-forward' into 'master'Phil Hughes
Allow modifying squash commit message for fast-forward only merge method Closes #48324, #58805, and #58631 See merge request gitlab-org/gitlab-ce!26017
2019-03-14Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"Tim Zallmann
Reverts the loading of emojis and its images to move forward with RC
2019-03-13Merge branch 'tz-load-emojis-from-server-not-cdn' into 'master'Filipa Lacerda
Removes the CDN loading for emojis.json See merge request gitlab-org/gitlab-ce!26102
2019-03-13Merge branch 'ce-9826-fix-broken-downstreams' into 'master'Kamil Trzciński
CE port for expanded pipelines See merge request gitlab-org/gitlab-ce!25859 (cherry picked from commit 71dbd613982c6f247b3897e2d012a261904178a4) 2dbf3da2 CE port for expanded pipelines
2019-03-13Merge branch 'modify_group_policy' into 'master'Rémy Coutable
Update group policy to reflect all the requirements See merge request gitlab-org/gitlab-ce!25854 (cherry picked from commit d8bbd3e78e2fe21048bf4c3ad58fd815c8339200) 0a706446 Modify group policy 8a37dd7a Add changelog to reflect changes 71e522a5 Remove not relevant changes 9559470b Remove not relevant changes
2019-03-12Merge branch 'tz-remove-csrf-token-for-emojis-json' into 'master'Mike Greiling
Removes the CSRF token if the emojis.json is on a CDN Closes #58784 See merge request gitlab-org/gitlab-ce!25979 (cherry picked from commit fcf632ef99fee06de42216e769ddfeb28967f17c) cf2b0dc5 Removes the CSRF token if the emojis.json is on a CDN
2019-03-12Merge branch 'sitcky-prefix-fix' into 'master'Filipa Lacerda
Fixed sticky bar styling in Safari Closes #58625 See merge request gitlab-org/gitlab-ce!25913 (cherry picked from commit c8116ebda8cfb1176d56ff371062e7564e969022) cf05e49f Fixed sticky bar styling in Safari
2019-03-08Revert "Merge branch 'remove-select2-rails' into 'master'"Marin Jankovski
This reverts merge request !17871
2019-03-08Merge branch '58649-project-template-for-android' into 'master'Sean McGivern
Resolve "Project template for Android" Closes #58649 See merge request gitlab-org/gitlab-ce!25870
2019-03-08remove select2-rails (select2 is now installed via yarn)Praveen Arimbrathodiyil
2019-03-08Merge branch 'ingress-hostnames' into 'master'Mike Greiling
Add support for ingress hostnames Closes #58244, #56158, and #46691 See merge request gitlab-org/gitlab-ce!25181
2019-03-08Merge branch '9224-create-mr-from-vulnerabilty-feedback-fe' into 'master'Luke Bennett
Fixes split button styling in modal footers (CE port) See merge request gitlab-org/gitlab-ce!25869
2019-03-08Provide EE backports for filtering by approver featureIgor
Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
2019-03-08Add support for ingress hostnameswalkafwalka
2019-03-08Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"Luke Duncalfe
This reverts merge request !25708