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/lib
AgeCommit message (Collapse)Author
2017-11-23Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan
Fix bitbucket wiki import with hashed storage enabled Closes #40292 See merge request gitlab-org/gitlab-ce!15490 (cherry picked from commit c043ba67c2d6a9493518408fd198dea30ce6cfcb) f2977c63 Fix bitbucket wiki import with hashed storage enabled
2017-11-23Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan
Don't move project repository/attachments when using hashed storage Closes #40289 See merge request gitlab-org/gitlab-ce!15479 (cherry picked from commit bd026b6a28ac410ad455b7b915cafc9782296b6b) fa39e8a0 Don't move project repository/attachments when using hashed storage
2017-11-23Merge branch ↵Sean McGivern
'39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master' Resolve "Notes API for issues no longer returns label additions/removals" Closes #39461 See merge request gitlab-org/gitlab-ce!15080 (cherry picked from commit f562e69eab0d7bac8ea20d29c3df981289dd8cdb) 4374a38f fix the commit reference pattern from matching other entities 160324d0 try to fix the failing spec on external refs 71b2cc1d reverting to the simpler approach 869fc05d fix the linting error 9ed91479 add the missing spec c900c21e add `#with_metadata` scope to remove a N+1 from the notes' API
2017-11-22Merge branch 'pawel/disable_prometheus_metrics' into 'master'Stan Hu
Temporarily force disable prometheus metrics See merge request gitlab-org/gitlab-ce!15549 (cherry picked from commit 3193f13b444dc08366ebe2c223fb59ef2862f30b) bf77f1cd Force disable Prometheus metrics
2017-11-21Resolve conflicts in lib/tasks/gitlab/cleanup.rakeWinnie Hellmann
2017-11-21Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master'Stan Hu
ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` Closes #40291 See merge request gitlab-org/gitlab-ce!15520 (cherry picked from commit b462edfddbd8e8b4449a6ae8cf482a9255f5d550) Conflicts: lib/tasks/gitlab/cleanup.rake
2017-11-21Merge branch 'sh-optimize-read-only-check' into 'master'Douwe Maan
Optimize read-only middleware so that it does not consume as much CPU Closes #40185 and gitlab-com/infrastructure#3240 See merge request gitlab-org/gitlab-ce!15504 (cherry picked from commit 6c3398165469de7890cd7881b175858f7c6be8e5) 3c52e2f0 Optimize read-only middleware so that it does not consume as much CPU cba68d33 use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers` 91075c82 check for `read_only?` first before seeing if request is disallowed aeb2f49f Revert "check for `read_only?` first before seeing if request is disallowed"
2017-11-21Mark all gitaly features as opt-inAlejandro Rodríguez
2017-11-20Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan
Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463 (cherry picked from commit 202ab62874bb3d828ab48017550660d461e8cf6b) 64a9e53b Fix conflict highlighting
2017-11-20Merge branch ↵Rémy Coutable
'40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use' into 'master' Fix Gitlab::Git::Repository#remote_tags using unexisting variable Closes #40300 See merge request gitlab-org/gitlab-ce!15466 (cherry picked from commit c563661f910934f1103690d46f9af8a75423077d) 63beaa32 Fix Gitlab::Git::Repository#remote_tags using unexisting variable d622a8c5 Merge branch 'master' into 40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use
2017-11-20Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan
Remove the selects when counting the last page Closes #40266 See merge request gitlab-org/gitlab-ce!15456 (cherry picked from commit c406824d319e5b1a073af7cf55c3f24bfa66e2a4) 5a335c4d Remove the selects when counting the last page
2017-11-17Merge branch 'fix/git-env-repo-paths' into 'master'Douwe Maan
Use relative git object paths to construct absolute ones before setting Env See merge request gitlab-org/gitlab-ce!15376 (cherry picked from commit 6ca24bd2e196ba3509d52b167bf7592c0afa2793) 52bfd064 Use relative git object paths to construct absolute ones before setting Env
2017-11-17Merge branch ↵Douwe Maan
'40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-json' into 'master' Resolve "/groups/gitlab-org/labels.json redirects to /groups/gitlab-org/-/labels/.json" Closes #40230 See merge request gitlab-org/gitlab-ce!15427 (cherry picked from commit 7142af49fa5947d439c1c539140538fc740f5187) 9f921b73 Don't add a trailing slash in group redirects
2017-11-17Merge branch 'dm-go-get-blank-enabled-protocol' into 'master'Sean McGivern
Fix go-import meta data when enabled_git_access_protocol is a blank string Closes #40256 See merge request gitlab-org/gitlab-ce!15448 (cherry picked from commit 69dd59aec9e5f8959fa36eb74db28d71aad4212b) f767dd4a Fix go-import meta data when enabled_git_access_protocol is a blank string
2017-11-17Merge branch 'sh-background-migration-move-mr-diff-id' into 'master'Sean McGivern
Convert migration to populate latest merge request ID into a background migration See merge request gitlab-org/gitlab-ce!15440 (cherry picked from commit 2dff37762f76b195d6b36d73dab544d0ec5e6c83) 5cecff89 Convert migration to populate latest merge request ID into a background migration
2017-11-16Merge branch 'fix/gb/update-registry-path-reference-regexp' into 'master'Kamil Trzciński
Update container repository path reference Closes #40199 See merge request gitlab-org/gitlab-ce!15417 (cherry picked from commit e07b0bd2954d1c95499d3303289bef0a17296667) f4df4f9e Update container repository path reference 3e3c84a7 Add changelog for container repository path update
2017-11-15Merge branch '39573-hashed-storage-backup' into 'master'Stan Hu
Fix gitlab:backup rake for hashed storage based repositories Closes #39573 See merge request gitlab-org/gitlab-ce!15400 (cherry picked from commit 43cb480aaa876db8023aaa17625c384c4e870045) f4c7fea6 Fix dumping hashed storage based repository cf6efd65 Changelog
2017-11-15Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse
Don't try to create fork network memberships for forks of forks Closes #40072 See merge request gitlab-org/gitlab-ce!15366 (cherry picked from commit 3730d89fe8578ce827468ebebef9cd6e33ae89f4) aaf18bb8 Don't try to create fork network memberships for forks of forks
2017-11-15Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan
Handle forks in Gitlab::Checks::LfsIntegrity Closes #39902 See merge request gitlab-org/gitlab-ce!15279 (cherry picked from commit c9515ca541ebaa3ce0a3208ab08eb59c580cbed6) 78ea074f Moved LfsIntegrity specs to own file ebd51744 Handle forks in Gitlab::Checks::LfsIntegrity
2017-11-14Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ↵Sean McGivern
into 'master' Revert "add metrics tagging to the sidekiq middleware" Closes #39958 See merge request gitlab-org/gitlab-ce!15285 (cherry picked from commit 43d98cd1ff3ea0dd6a794ba4d1d621415d439985) 7fd3ce41 Revert "add metrics tagging to the sidekiq middleware"
2017-11-10Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan
Icon Sprite URL needs to be local even if asset_host is set See merge request gitlab-org/gitlab-ce!15289 (cherry picked from commit e482a4d59dae6437a64ae4ccbe6976ffced7b9ba) 25eea058 Icon Sprite URL is also local even if asset_host is set 81eaf171 Fixed URL Matching in Tests 687e7dea Put Icons Path in Helper fb1b88de Missing the local url 01240a18 Fixed Function + Test based on MR fce34b4b Removed Brackets
2017-11-10Merge branch 'github-rake-task-rate-limiting' into 'master'Douwe Maan
Add GitHub enterprise support to the GitHub Rake task and better handle rate limiting being disabled See merge request gitlab-org/gitlab-ce!15284 (cherry picked from commit 760b2c75ef9d2c6acb655860dceae4c04cd8e5a7) 48cb1c50 Restore GH enterprise support in the Rake task f37fe2ed Support importing GH projects without rate limits
2017-11-10Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu
Fail when issuable_meta_data is called on an unlimited collection Closes #39845 See merge request gitlab-org/gitlab-ce!15249 (cherry picked from commit 0c3877a48827b587b407174410196993bec79f73)
2017-11-10Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan
Github enterprise support importer Closes #39931 See merge request gitlab-org/gitlab-ce!15281 (cherry picked from commit 1d7e2a961aec86e50f3159ad3b82524e86b007c2)
2017-11-10Merge branch 'gitaly-700-wiki-update-page' into 'master'Douwe Maan
Migrate GitLab::Git::Wiki.update_page to Gitaly Closes gitaly#700 See merge request gitlab-org/gitlab-ce!15268 (cherry picked from commit ce06415cb6af38b5dab88d1babfe1888213a0684)
2017-11-10Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master'Rémy Coutable
Fix Error 500 when pushing LFS objects with a write deploy key Closes #39467 See merge request gitlab-org/gitlab-ce!15039 (cherry picked from commit 07ab4ad60a894d60ac561f9fdbd641fac90b4acc)
2017-11-10Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable
Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us Closes #34509 See merge request gitlab-org/gitlab-ce!15253 (cherry picked from commit bf13746fd8c7af1ef2e28e8a5a46cf0229b31eb8)
2017-11-10Merge branch 'github-importer-refactor' into 'master'Douwe Maan
Rewrite the GitHub importer to perform work in parallel and greatly improve performance Closes #33135, #38621, and #39361 See merge request gitlab-org/gitlab-ce!14731 (cherry picked from commit 92249f1ac883c2a861235ec49526cbafca73b362)
2017-11-10Merge branch 'feature-change-signout-route' into 'master'Douwe Maan
Change Sign Out route from a DELETE to a GET Closes #39708 See merge request gitlab-org/gitlab-ce!15231 (cherry picked from commit b579cc7620dad1d406e974cce2d9ad5a4ce58a57)
2017-11-08Merge branch 'bvl-free-paths' into 'master'Douwe Maan
Free some reserved group routes See merge request gitlab-org/gitlab-ce!15052
2017-11-08Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into ↵Stan Hu
'master' Make BackgroundTransaction#labels public See merge request gitlab-org/gitlab-ce!15257
2017-11-07Improve GitLab Import rake task to work with Hashed Storage and SubgroupsJames Lopez
2017-11-07Remove EE-specific group pathsBob Van Landuyt
2017-11-07Check redirecting with a querystringBob Van Landuyt
2017-11-07Free up some group reserved wordsBob Van Landuyt
2017-11-07Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt
2017-11-07Free up `labels` as a group nameBob Van Landuyt
2017-11-07Add helper methods to redirect legacy pathsBob Van Landuyt
2017-11-07Make BackgroundTransaction#labels publicPawel Chojnacki
as are all other Transaction implementations
2017-11-07Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Shinya Maeda
into 38464-k8s-apps
2017-11-07Review Gitlab::Kubernetes::NamespaceAlessio Caiazza
2017-11-07Merge branch 'master' into 38464-k8s-appsShinya Maeda
2017-11-07Merge branch '39903-restore-backup-warning' into 'master'Douwe Maan
Make restoring backup database table warning more explicit Closes #39903 See merge request gitlab-org/gitlab-ce!15246
2017-11-07Add Helm InstallCommandAlessio Caiazza
2017-11-07Merge branch 'fix/import-export-arguments' into 'master'Douwe Maan
Fix arguments error on Import/Export fetch_ref method Closes #39541 See merge request gitlab-org/gitlab-ce!15241
2017-11-07Merge branch '39831-warning-icon-in-jobs-dropdown-has-incorrect-style' into ↵Clement Ho
'master' Resolve "Warning icon in jobs dropdown has incorrect style" Closes #39831 See merge request gitlab-org/gitlab-ce!15221
2017-11-07show better message when deciding not to continuedigitalMoksha
2017-11-07Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable
Fix TRIGGER checks for MySQL Closes #38372 See merge request gitlab-org/gitlab-ce!15226
2017-11-07fix specsJames Lopez
2017-11-07Make warning message more explicitdigitalMoksha