summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Show available clusters when installed or updatedPeter Leitzen2018-10-165-8/+13
| | | | | Before this commit updating Prometheus (e.g. adding alerts) made it "updated" therefore not installed.
* Merge branch 'da-fix-does-not-import-projects-over-ssh' into 'master'Stan Hu2018-10-161-5/+8
|\ | | | | | | | | Does not allow a SSH URI when importing a project See merge request gitlab-org/gitlab-ce!22309
| * Does not allow an import_url with SSH protocolDouglas Barbosa Alexandre2018-10-151-5/+8
| |
* | Merge branch 'revert-f90fc922' into 'master'Mike Greiling2018-10-151-2/+1
|\ \ | |/ |/| | | | | Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'" See merge request gitlab-org/gitlab-ce!22315
| * Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into ↵Luke Bennett2018-10-121-2/+1
| | | | | | | | | | 'master'" This reverts merge request !21551
* | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-152-13/+3
|\ \ | | | | | | | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
| * | Remove Koding integration and documentationStan Hu2018-10-122-13/+3
| |/ | | | | | | | | | | This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
* | Merge branch 'bvl-merge-base-multiple-revisions' into 'master'Douwe Maan2018-10-151-4/+6
|\ \ | | | | | | | | | | | | | | | | | | Allow getting the merge base of multiple revisions Closes #52573 See merge request gitlab-org/gitlab-ce!22295
| * | Allow getting the merge base of multiple revisionsBob Van Landuyt2018-10-121-4/+6
| | | | | | | | | | | | | | | As we now support getting the merge base for multiple revisions in gitaly, we can provide this functionality in our API
* | | Merge branch 'zj-remove-linguist' into 'master'Robert Speicher2018-10-152-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove dependencies on Linguist Closes #35450 See merge request gitlab-org/gitlab-ce!21008
| * | | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-122-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
* | | Backport CE changes for Ops Dashboard in EEPeter Leitzen2018-10-123-1/+14
|/ /
* | Fix project deletion when there is a export availableStan Hu2018-10-101-1/+1
|/ | | | | | | | | | | | | | | | Project deletions were failing with "Can't modify frozen hash" because: 1. Project#remove_exports was called in the after_destroy hook 2. This would remove the file and update ImportExportUpload 3. ImportExportUpload#save would attempt to write to a destroyed model To avoid this, we just check if ImportExportUpload has been destroyed before attempting to save it. This would have a side effect of not running after_commit hooks to delete the repository on disk, making it impossible to delete the project entirely. Closes #52362
* Remove Git circuit breakerZeger-Jan van de Weg2018-10-101-11/+7
| | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* Merge branch '52367-cleanup-web-hooks-columns' into 'master'Rémy Coutable2018-10-091-34/+0
|\ | | | | | | | | | | | | Remove unencrypted webhook token and URL columns Closes #52367 See merge request gitlab-org/gitlab-ce!22199
| * Remove unencrypted webhook token and URL columnsNick Thomas2018-10-091-34/+0
| |
* | Merge branch 'sh-fix-note-comments' into 'master'Robert Speicher2018-10-081-3/+3
|\ \ | | | | | | | | | | | | Fix comments in app/models/note.rb See merge request gitlab-org/gitlab-ce!22171
| * | Fix comments in app/models/note.rbStan Hu2018-10-061-3/+3
| | | | | | | | | | | | | | | This resolves a conflict and inconsistency with the EE version of app/models/note.rb.
* | | Clean up ActiveRecord code in TodoServiceYorick Peterse2018-10-082-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the TodoService class according to our code reuse guidelines. The resulting code is a wee bit more verbose, but it allows us to decouple the column names from the input, resulting in fewer changes being necessary when we change the schema. One particular noteworthy line in TodoService is the following: todos_ids = todos.update_state(state) Technically this is a violation of the guidelines, because `update_state` is a class method, which services are not supposed to use (safe for a few allowed ones). I decided to keep this, since there is no alternative. `update_state` doesn't produce a relation so it doesn't belong in a Finder, and we can't move it to another Service either. As such I opted to just use the method directly. Cases like this may happen more frequently, at which point we should update our documentation with some sort of recommendation. For now, I want to refrain from doing so until we have a few more examples.
* | | Clean up ActiveRecord code in TodosFinderYorick Peterse2018-10-082-0/+27
| |/ |/| | | | | | | | | | | | | This refactors the TodosFinder finder according to the new code reuse rules, as enforced by the CodeReuse cops. I also changed some of the methods to use regular if statements, instead of assignments and/or early returns. This results in a more natural flow when reading the code, and it makes it harder to accidentally return the wrong result.
* | Render log artifact files in GitLabZeger-Jan van de Weg2018-10-081-1/+1
| |
* | Check disabled_services when finding a serviceBrett Walker2018-10-061-3/+3
|/
* Add timed incremental rollout to Auto DevOpsAlessio Caiazza2018-10-051-5/+15
| | | | | | | | | | | | | Auto DevOps deployment strategies now supports timed incremental rollout. We are deprecating the usage of INCREMENTAL_ROLLOUT_ENABLED environment variable in Auto DevOps template. The new behavior will be driven by the INCREMENTAL_ROLLOUT_MODE variable that can either be manual (same as INCREMENTAL_ROLLOUT_ENABLED) or timed. Rollout deployments will be executed using a 5 minute delay between each job.
* Merge branch ↵Sean McGivern2018-10-051-18/+17
|\ | | | | | | | | | | | | | | | | '43109-ci_environments_status-json-executes-more-than-100-queries' into 'master' Resolve "Controller Projects::MergeRequestsController#ci_environments_status.json executes more than 100 SQL queries" Closes #43109 See merge request gitlab-org/gitlab-ce!21996
| * Don't build project services unneccesarilyBrett Walker2018-10-041-18/+17
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-053-13/+21
|\ \
| * \ Merge branch 'security-bw-confidential-titles-through-markdown-api' into ↵Bob Van Landuyt2018-10-051-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [master] Confidential issue/private snippet titles can be read by unauthenticated user through GFM markdown API Closes #2706 See merge request gitlab/gitlabhq!2507
| | * | post_process markdown redered by APIBrett Walker2018-09-291-1/+1
| | | |
| * | | Merge branch 'security-fix-leaking-private-project-namespace' into 'master'Bob Van Landuyt2018-10-052-12/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix leaking private project namespace Closes #2708 See merge request gitlab/gitlabhq!2529
| | * | | Filter system notes with public and private cross referencesBrett Walker2018-10-022-12/+20
| | | | |
* | | | | Merge branch 'issue_43097' into 'master'Sean McGivern2018-10-051-18/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move related branches to service Closes #43097 See merge request gitlab-org/gitlab-ce!22094
| * | | | | Move issue related_branches to serviceFelipe Artur2018-10-041-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the related_branches method from Issue model to RelatedBranchesService
* | | | | | Merge branch 'ce-5987-project-templates-api' into 'master'Robert Speicher2018-10-051-5/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
| * | | | | | Backport project template API to CENick Thomas2018-10-051-5/+3
| | | | | | |
* | | | | | | Merge branch 'scheduled-manual-jobs' into 'master'Kamil Trzciński2018-10-055-16/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767
| * \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-056-74/+147
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-055-6/+25
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Make Ci::Stage status transition event consistent with Ci::PipelineShinya Maeda2018-10-041-2/+2
| | | | | | | | |
| * | | | | | | | Enable ci_enable_scheduled_build feature flag by defaultShinya Maeda2018-10-041-1/+1
| | | | | | | | |
| * | | | | | | | Rename event :schedule to event :delay in Ci::Pipeline to avoid conflicts ↵Shinya Maeda2018-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with enum source
| * | | | | | | | Revert "Avoid conflicts between enumlator's schedule! method and state ↵Shinya Maeda2018-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | machine's schedule! method" This reverts commit 10b09db46ddfdc6dfab55fa9671e716cd46a565b.
| * | | | | | | | Avoid conflicts between enumlator's schedule! method and state machine's ↵Shinya Maeda2018-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schedule! method
| * | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-042-6/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-033-1/+35
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Rename failure reason to stale_scheduleShinya Maeda2018-10-021-1/+1
| | | | | | | | | |
| * | | | | | | | | Add scheduled_actions as an explicit group of actionsShinya Maeda2018-10-022-1/+3
| | | | | | | | | |
| * | | | | | | | | Change the order of status_sql to avoid the query for scheduled status at ↵Shinya Maeda2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the earlier step
| * | | | | | | | | Include delayed jobs action into manual actionsShinya Maeda2018-10-021-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix StuckCiJobsWorker and added testsShinya Maeda2018-10-021-1/+1
| | | | | | | | | |
| * | | | | | | | | Add Spec for ProcessPipelineServiceShinya Maeda2018-10-021-1/+1
| | | | | | | | | |
View Lorry Controller Status