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-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
2017-11-07Fix arguments error on Import/Export fetch_ref methodJames Lopez
Added unit test and updated integration spec to test for this as well.
2017-11-07Add k8s namespace implementation and testsAlessio Caiazza
2017-11-07Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Shinya Maeda
into 38464-k8s-apps
2017-11-07Merge branch 'master' into 38464-k8s-appsShinya Maeda
2017-11-07Merge branch ↵Douwe Maan
'37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request' into 'master' Fetch the merged branches at once in the `/projects/:id/repository/branches` endpoint See merge request gitlab-org/gitlab-ce!15215
2017-11-07Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable
Support custom attributes on groups and projects See merge request gitlab-org/gitlab-ce!14593
2017-11-07Merge branch 'add-changes-count-to-merge-requests-api' into 'master'Rémy Coutable
Add changes_count to the merge requests API See merge request gitlab-org/gitlab-ce!15178
2017-11-07Remove Project#clusters exportAlessio Caiazza
2017-11-07Fix GFM reference links for closed milestonesVitaliy @blackst0ne Klachkov
2017-11-07Merge branch 'master' into 38464-k8s-appsEric Eastwood
Conflicts: db/schema.rb
2017-11-07Fix TRIGGER checks for MySQLYorick Peterse
This ensures we can check if the user has TRIGGER permissions without querying restricted tables. Thanks to Steve Norman (https://gitlab.com/stevenorman) for helping out with this merge request. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38372
2017-11-07Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon
Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879
2017-11-07Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'Grzegorz Bizon
Add all InfluxDB metrics to prometheus See merge request gitlab-org/gitlab-ce!13891
2017-11-06Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern
removed the #ensure_ref_fetched from all controllers Closes #36061 See merge request gitlab-org/gitlab-ce!15129
2017-11-06Add Helm import/exportAlessio Caiazza
2017-11-06Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López
2017-11-06Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza
2017-11-06Merge branch 'jej/fs-prevent-push-when-missing-objects' into 'master'Douwe Maan
Prevent git push when LFS objects are missing Closes #24564 See merge request gitlab-org/gitlab-ce!13837
2017-11-06Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-06Fixed Status Warning IconTim Zallmann