summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ /
* | 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
| | | | |