summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Update Runner Chart to 0.1.35Tomasz Maczukin2018-10-231-1/+1
|
* Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-231-3/+9
|\ | | | | | | | | Support licenses and performance See merge request gitlab-org/gitlab-ce!22175
| * Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-221-3/+9
| | | | | | | | | | | | | | | | | | | | | | This introduces a new syntax for all licenses and performance jobs: ```yaml job: reports: performance: performance.json license_management: gl-license-management-report.json ```
* | Merge branch 'lfs-project-attribute-alias' into 'master'Nick Thomas2018-10-231-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Alias the lfs_enabled method Closes #49348 See merge request gitlab-org/gitlab-ce!22501
| * | Alias the lfs_enabled methodlfs-project-attribute-aliasCindy Pallares2018-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | We currently check for `project.lfs_enabled` to display the state of lfs being enabled/disabled, but this is set to nil by default, even when lfs is enabled. Aliasing the method to #lfs_enabled? will return the correct state.
* | | Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵Oswaldo Ferreira2018-10-233-0/+69
| | | | | | | | | | | | requests"
* | | Merge branch '42611-removed-branch-link' into 'master'Grzegorz Bizon2018-10-231-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Removed branch link in pipelines page is broken" Closes #42611 See merge request gitlab-org/gitlab-ce!21451
| * | | Do not raise error when checking pipeline reference42611-removed-branch-linkGrzegorz Bizon2018-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return from the `Ci::Pipeline#ref_exists?` in case when there is no repository present. This also fixes pipeline page feature specs by changing pipeline reference instead of stubbing `ref_exist?` method.
| * | | Fix pipeline reference existence check and add specsGrzegorz Bizon2018-10-221-3/+3
| | | |
| * | | Creates ref_exists? method for Pipeline classFilipa Lacerda2018-10-081-0/+4
| | | |
* | | | Merge branch '51716-add-kubernetes-namespace-model' into 'master'Andreas Brandl2018-10-224-1/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Clusters::KubernetesNamespace model See merge request gitlab-org/gitlab-ce!22404
| * | | | Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-modelMayra Cabrera2018-10-224-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | | This model will be used to persist into database Kubernetes properties, such as namespace, service account name and service account token.
* | | | | Merge branch 'refactor-project-rename-repo' into 'master'Robert Speicher2018-10-221-73/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move Project#rename_repo to a service class See merge request gitlab-org/gitlab-ce!22419
| * | | | | Move Project#rename_repo to a service classrefactor-project-rename-repoYorick Peterse2018-10-221-73/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the logic of Project#rename_repo and all methods _only_ used by this method into a new service class: Projects::AfterRenameService. By moving this code into a separate service class we can more easily refactor it, and we also get rid of some RuboCop "disable" statements automatically. During the refactoring of this code, I removed most of the explicit logging using Gitlab::AppLogger. The data that was logged would not be useful when debugging renaming issues, as it does not add any value on top of data provided by users. I also removed a variety of comments that either mentioned something the code does in literal form, or contained various grammatical errors. Instead we now resort to more clearly named methods, removing the need for code comments. This method was chosen based on analysis in https://gitlab.com/gitlab-org/release/framework/issues/28. In this issue we determined this method has seen a total of 293 lines being changed in it. We also noticed that RuboCop determined the ABC size (https://www.softwarerenovation.com/ABCMetric.pdf) was too great.
* | | | | | Backport rescue in Project#import_url from EEbackport-ee-import-url-rescueYorick Peterse2018-10-221-0/+2
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | EE added a `rescue` to the method Project#import_url, which could cause merge conflicts when changing this method. This commit backports those changes to CE, reducing the chances of running into a merge conflict.
* | | | | Update Guide for Microsoft Teams Notification IntegrationAbubakar Siddiq Ango2018-10-221-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'use-raw-file-format' into 'master'Grzegorz Bizon2018-10-221-6/+11
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Add RAW file format which is used to store security reports Closes gitlab-ee#7996 See merge request gitlab-org/gitlab-ce!22365
| * | | Make all legacy security reports to use raw formatuse-raw-file-formatKamil Trzciński2018-10-161-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This introduces and uses `:raw` format for all legacy reports, the ones that do not have yet proper parsers on Backend - Raw format is needed to make Frontend be able to parse reports, without the need of decompressing, - This also extends fixtures to seed security reports with database, even though parser code is part of EE
* | | | Update used version of Runner Helm Chart to 0.1.34Tomasz Maczukin2018-10-191-1/+1
| | | |
* | | | Merge branch 'ccr/43034_issues_controller_100_queries' into 'master'Douglas Barbosa Alexandre2018-10-192-31/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add preload for routes and namespaces for issues controller. Closes #43034 See merge request gitlab-org/gitlab-ce!21651
| * | | | Add preload in issues controllerChantal Rollison2018-10-182-31/+49
| | | | |
* | | | | Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-192-23/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
| * | | | | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-192-23/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* | | | | Correctly process Bamboo API resultsAlex Lossent2018-10-191-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Bamboo API returns an array of results as per https://docs.atlassian.com/atlassian-bamboo/REST/6.2.5/#d2e786
* | | | | Merge branch 'ac-review-app-changes-33418' into 'master'Nick Thomas2018-10-191-0/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose changed URLs in MR ci_environments_status See merge request gitlab-org/gitlab-ce!22228
| * | | | | Show modified and added public paths in MRAlessio Caiazza2018-10-181-0/+29
| | | | | |
| * | | | | Move ci_environments_status to a modelAlessio Caiazza2018-10-181-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GET :namespace/merge_requests/:id/ci_environments_status complexity already reached a limit for a direct serialization from an hash computed at within the controller function. Here we introduce a virtual model EnvironmentStatus and its serializer.
* | | | | | Make getting a user by the username case insensitiveWilliam George2018-10-181-1/+1
| | | | | |
* | | | | | Merge branch '52527-harden-wiki-against-missing-last-version' into 'master'Douglas Barbosa Alexandre2018-10-171-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Harden the wiki against missing last_versions Closes #52527 See merge request gitlab-org/gitlab-ce!22377
| * | | | | | Harden the wiki against missing last_versionsNick Thomas2018-10-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we assume a "last_version" always exists for a wiki page. In production, this is not always true. So, guard uses of it with a null check.
* | | | | | | Merge branch 'gt-remove-prometheus-configuration-help-text' into 'master'Clement Ho2018-10-171-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove prometheus configuration help text Closes #52782 See merge request gitlab-org/gitlab-ce!22413
| * | | | | | | Remove prometheus configuration help textGeorge Tsiolis2018-10-171-1/+0
| | | | | | | |
* | | | | | | | Merge branch '49591-use-cached-readme-blobs' into 'master'Rémy Coutable2018-10-172-27/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use cached readme blobs where appropriate Closes #49591 See merge request gitlab-org/gitlab-ce!22325
| * | | | | | | | Use cached readme blobs where appropriateNick Thomas2018-10-172-27/+43
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab keeps a cache of the rendered HTML for a repository's README as stored in the HEAD branch. However, it was not used in all circumstances. In particular, the new blob viewer framework bypassed this cache entirely. This MR ensures a ::ReadmeBlob is returned instead of a ::Blob when asking a repository for an individual blob, if the commit and path match the readme for HEAD. This makes the cached HTML available to consumers, including the blob viewer. The ReadmeBlob is a simple delegator to the Blob, so should be compatible in all cases. Adding the rendered_markdown method is the only additional behaviour it contains.
* | | | | | | | Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-171-48/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab-grit as a transitive dependency of GitLab Closes #44361 See merge request gitlab-org/gitlab-ce!22373
| * | | | | | | Merge flowdock monkeypatch into the inlined gemNick Thomas2018-10-161-48/+0
| | | | | | | |
| * | | | | | | Inline the gitlab-flowdock-git-hooks gemNick Thomas2018-10-161-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to avoid one transitive dependency on gitlab-grit. The aim is to remove all transitive dependencies.
* | | | | | | Allow JIRA to login using email and API tokenFelipe Artur2018-10-171-2/+5
|/ / / / / /
* | | | | | 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
|/ / /