summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Fix letter opener gem errorFelipe Artur2019-04-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessing http://localhostrails/letter_opener is thowring an exception, updating the gem fixes it.
* | | | | | | | | | | | | | | Merge branch 'fj-refactor-lfs-import-code' into 'master'James Lopez2019-04-3011-234/+326
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor LfsImportService and ImportService See merge request gitlab-org/gitlab-ce!27255
| * | | | | | | | | | | | | | | Refactored LfsImportService and ImportServiceFrancisco Javier López2019-04-3011-234/+326
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make `LfsImportService` more reusable, we need to extract the logic inside `ImportService` and encapsulate it into the service.
* | | | | | | | | | | | | | | Merge branch 'sh-disable-batch-load-replace-methods' into 'master'Sean McGivern2019-04-305-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable method replacement in avatar loading Closes #60903 See merge request gitlab-org/gitlab-ce!27866
| * | | | | | | | | | | | | | | Disable method replacement in avatar loadingStan Hu2019-04-295-4/+18
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've seen a significant performance penalty when using `BatchLoader#__replace_with!`. This defines methods on the batch loader that proxy to the 'real' object using send. The alternative is `method_missing`, which is slower. However, we've noticed that `method_missing` can be faster if: 1. The objects being loaded have a large interface. 2. We don't call too many methods on the loaded object. Avatar uploads meet both criteria above, so let's use the newly-released feature in https://github.com/exAspArk/batch-loader/pull/45. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60903
* | | | | | | | | | | | | | | Merge branch 'uninstall_cluster_apps' into 'master'Stan Hu2019-04-3042-30/+848
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uninstall cluster applications (backend services) Closes #60665 See merge request gitlab-org/gitlab-ce!27096
| * | | | | | | | | | | | | | | Add a newline in spec for readabilityStan Hu2019-04-291-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove unncessary `to_time` in cluster servicesDylan Griffith2019-04-292-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Internationalize errors CheckUninstallProgressServiceDylan Griffith2019-04-292-4/+13
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rename #timeouted -> #timed_outDylan Griffith2019-04-296-11/+11
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use #public_send instead #method.callDylan Griffith2019-04-293-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These builder methods are using user provided input inside a public_send but this is safe to do in this instance because before they are called we check before calling them that they match an expected application name.
| * | | | | | | | | | | | | | | Minor refactor of prometheus_specDylan Griffith2019-04-291-4/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Minor refactoring in check_uninstall_progress_service_specDylan Griffith2019-04-291-5/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | In Prometheus use update! instead of updateDylan Griffith2019-04-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to not miss any errors since we are not checking the return value of update
| * | | | | | | | | | | | | | | CheckUninstallProgressService remove unnecessary beginDylan Griffith2019-04-291-3/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix uninstall specs: helm not uninstallableDylan Griffith2019-04-292-9/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Deactivate any prometheus_service upon destroyThong Kuah2019-04-292-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically does the reverse of after_transition to :installed.
| * | | | | | | | | | | | | | | Remove xit test for uninstall group cluster appDylan Griffith2019-04-291-60/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | DELETE clusters/:id/:application endpointThong Kuah2019-04-298-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add endpoint to delete/uninstall a cluster application
| * | | | | | | | | | | | | | | Teach Prometheus about #uninstall_commandThong Kuah2019-04-292-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs
| * | | | | | | | | | | | | | | Expose can_uninstall in cluster_status.jsonThong Kuah2019-04-2918-1/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only prometheus can be uninstalled atm, the rest will be dealt with later. Presumption is that new application types will have uninstallation implmemented at the same time.
| * | | | | | | | | | | | | | | Destroy app on successful uninstallationThong Kuah2019-04-295-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rescue and put into :uninstall_errored if something goes wrong while destroying, which can happen. I think it is safe to expose the full error message from the destroy error. Remove the :uninstalled state as no longer used.
| * | | | | | | | | | | | | | | Services to uninstall cluster applicationThong Kuah2019-04-297-0/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + to monitor progress of uninstallation pod
| * | | | | | | | | | | | | | | Teach Helm::Api about #uninstallThong Kuah2019-04-292-0/+29
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Define state transitions for uninstalling appsThong Kuah2019-04-293-17/+98
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added :uninstalled state as wasn't sure if we should be destroying the cluster apps
* | | | | | | | | | | | | | | Merge branch 'fix-ref-text-of-mr-pipelines' into 'master'Ash McKenzie2019-04-305-15/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines for merge requests does not show pipeline page when source branch is removed Closes #60432 See merge request gitlab-org/gitlab-ce!27803
| * | | | | | | | | | | | | | | Fix ref_text of merge request pipelinesfix-ref-text-of-mr-pipelinesShinya Maeda2019-04-305-15/+103
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source branch can be removed after the merge and we have to make sure to avoid rendering links if it's the case.
* | | | | | | | | | | | | | | Merge branch 'docs-ci-index-refactor' into 'master'Evan Read2019-04-302-81/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add intro and reorg CI index Closes #58323 See merge request gitlab-org/gitlab-ce!27620
| * | | | | | | | | | | | | | | Merge feature set tables into oneMarcia Ramos2019-04-302-81/+113
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus: add note for .com users
* | | | | | | | | | | | | | | Merge branch ↵Ash McKenzie2019-04-305-67/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master' Delete leftover code for referenced_merge_requests endpoint Closes #60476 See merge request gitlab-org/gitlab-ce!27335
| * | | | | | | | | | | | | | Delete leftover code for referenced_merge_requests60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varianFatih Acet2019-04-155-67/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We rewrote Related MRs widget using Vue. The previous implementation was using Haml templates and calling referenced_merge_requests endpoint which is now deprecated. This MR deletes leftover stuff them.
* | | | | | | | | | | | | | | Merge branch 'fix-boards-card-dragging-styling' into 'master'Annabel Dunstone Gray2019-04-292-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed boards card dragging styling Closes #61050 See merge request gitlab-org/gitlab-ce!27802
| * | | | | | | | | | | | | | | Fixed boards card dragging stylingPhil Hughes2019-04-292-1/+2
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61050
* | | | | | | | | | | | | | | Merge branch '61036-fix-ingress-base-domain-text' into 'master'Tim Zallmann2019-04-293-36/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix base domain help text update Closes #61036 See merge request gitlab-org/gitlab-ce!27746
| * | | | | | | | | | | | | | | Add changelog entryEnrique Alcantara2019-04-261-0/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix base domain help text updateEnrique Alcantara2019-04-262-36/+11
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'js-i18n-mirrors-monitoring-mr-popover' into 'master'Tim Zallmann2019-04-294-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of javascript/m* directories See merge request gitlab-org/gitlab-ce!27723
| * | | | | | | | | | | | | | | | Internationalisation of javascript/m* directoriesBrandon Labuschagne2019-04-294-6/+14
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | | | | | | | | Merge branch 'js-i18n-vue-shared' into 'master'Tim Zallmann2019-04-292-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of vue_shared directory See merge request gitlab-org/gitlab-ce!27751
| * | | | | | | | | | | | | | | | Internationalisation of vue_shared directoryBrandon Labuschagne2019-04-292-1/+6
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets the Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | | | | | | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Clement Ho2019-04-292-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.7.0 See merge request gitlab-org/gitlab-ce!27832
| * | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.7.0Lukas 'Eipi' Eipert2019-04-292-11/+11
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '59265-project-is-being-serialized-when-enqueueing-to-sidekiq' ↵Rémy Coutable2019-04-292-7/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Project is being serialized when enqueueing to sidekiq" Closes #59265 See merge request gitlab-org/gitlab-ce!27825
| * | | | | | | | | | | | | | | | Stop serialising project when removing todosSean McGivern2019-04-292-7/+20
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Todos::Destroy::EntityLeaveService#project_ids` was returning ActiveRecord objects with IDs, not simply IDs. That means we were serialising more than we needed to in Sidekiq. We can simply rename this method to `#projects` as this class doesn't use any of the superclass methods that would use `#project_ids`.
* | | | | | | | | | | | | | | | Merge branch 'lock-pipeline-schedule-worker' into 'master'Stan Hu2019-04-293-11/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent concurrent execution of PipelineScheduleWorker Closes gitlab-com/gl-infra/production#805 See merge request gitlab-org/gitlab-ce!27781
| * | | | | | | | | | | | | | | | Prevent concurrent execution of PipelineScheduleWorkerShinya Maeda2019-04-283-11/+34
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, PipelineScheduleWorker is fired in a short period on our production server. We can stop this behavior by locking the execution thread with in_lock method.
* | | | | | | | | | | | | | | | Merge branch '6565-move-sidekiq-cluster-ce' into 'master'Robert Speicher2019-04-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change comments to point to the new path of sidekiq-cluster See merge request gitlab-org/gitlab-ce!27707
| * | | | | | | | | | | | | | | | Change path of bin/sidkiq-cluster in commentsHossein Pursultani2019-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sidekiq-cluster` is moved from `bin/` to `ee/bin` in EE code. This is a corresponding change in CE.
* | | | | | | | | | | | | | | | | Merge branch 'pl-upgrade-letter_opener_web' into 'master'Stan Hu2019-04-293-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade letter_opener_web to support Rails 5.1 See merge request gitlab-org/gitlab-ce!27829
| * | | | | | | | | | | | | | | | | Upgrade letter_opener_web to support Rails 5.1Peter Leitzen2019-04-293-4/+9
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit using `/rails/letter_opener` in `development` environment failed with: undefined method `before_filter' See https://github.com/fgrehm/letter_opener_web/issues/68 This commit upgrades `letter_opener_web` to 1.3.4 so Rails 5.1 is supported.