summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Remove some deprecated codedz-cleanup-deprecated-codeDmitriy Zaporozhets2019-06-072-12/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Setup Git client for JupyterAmit Rathi2019-06-051-1/+10
|
* Merge branch 'issue_49897' into 'master'Robert Speicher2019-06-051-0/+3
|\ | | | | | | | | | | | | Delete unauthorized Todos when project is private Closes #49897 See merge request gitlab-org/gitlab-ce!28560
| * Delete unauthorized Todos when project is privateissue_49897Felipe Artur2019-06-051-0/+3
| | | | | | | | | | Delete Todos for guest users when project visibility level is updated to private.
* | Merge branch '54140-non-ar-cache-commit-markdown' into 'master'Douwe Maan2019-06-052-79/+20
|\ \ | |/ |/| | | | | | | | | Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
| * Use Redis for CacheMarkDownField on non AR modelsPatrick Bajao2019-06-052-79/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows using `CacheMarkdownField` for models that are not backed by ActiveRecord. When the including class inherits `ActiveRecord::Base` we include `Gitlab::MarkdownCache::ActiveRecord::Extension`. This will cause the markdown fields to be rendered and the generated HTML stored in a `<field>_html` attribute on the record. We also store the version used for generating the markdown. All other classes that include this model will include the `Gitlab::MarkdownCache::Redis::Extension`. This add the `<field>_html` attributes to that model and will generate the html in them. The generated HTML will be cached in redis under the key `markdown_cache:<class>:<id>`. The class this included in must therefore respond to `id`.
* | Avoid 500's when commit is not reachableOswaldo Ferreira2019-06-051-1/+1
|/
* Merge branch 'ce-9578-adjust-opened-issues-count-and-completion-rate' into ↵Robert Speicher2019-06-041-14/+6
|\ | | | | | | | | | | | | 'master' Port: EE adjust burndown chart opened issues count See merge request gitlab-org/gitlab-ce!28777
| * Adjust burndown chart opened issues countce-9578-adjust-opened-issues-count-and-completion-rateAlexandru Croitor2019-06-041-14/+6
| | | | | | | | | | | | * Adjust opened issues count in the milestone burndown chart to match current opened issues in the milestone. * Fix completion rate calculation to include milestones only.
* | Merge branch 'bvl-design-diff-notes-ce' into 'master'Douwe Maan2019-06-043-11/+21
|\ \ | | | | | | | | | | | | Adjustments related to DiffNotes on diffs outside of a project's main repository See merge request gitlab-org/gitlab-ce!29023
| * | Get `repository` from noteable in DiffNotesBob Van Landuyt2019-06-031-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the `repository` directly from the noteable in DiffNotes allows us to use a different repository when the DiffNote is not on a project repository. It is only the first step in decoupling the DiffNote from a project's main repository.
| * | Make `resolvable_types` a class methodBob Van Landuyt2019-06-033-6/+12
| | | | | | | | | | | | | | | This turns Notable::RESOLVABLE_TYPES into a `Notable.resolvable_types`. That allows us to override it in EE.
* | | Merge branch ↵Grzegorz Bizon2019-06-042-48/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58941-use-gitlab-serverless-with-existing-knative-installation' into 'master' Resolve "Use GitLab serverless with existing Knative installation" Closes #58941 See merge request gitlab-org/gitlab-ce!27173
| * | | Adapt functions to work for external KnativeJoão Cunha2019-05-292-48/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Kn services cache from Clusters::Application::Knative Knative function can exist even if user did not installed Knative via GitLab managed apps. -> Move responsibility of finding services into the Cluster -> Responsability is inside Clusters::Cluster::KnativeServiceFinder -> Projects::Serverless::FunctionsFinder now calls depends solely on a cluster to find the Kn services. -> Detect Knative by resource presence instead of service presence -> Mock knative_installed response temporarily for frontend to develop Display loader while `installed === 'checking'` Added frontend work to determine if Knative is installed Memoize with_reactive_cache(*args, &block) to avoid race conditions When calling with_reactive_cache more than once, it's possible that the second call will already have the value populated. Therefore, in cases where we need the sequential calls to have consistent results, we'd fall under a race condition. Check knative installation via Knative resource presence Only load pods if Knative is discovered Always return a response in FunctionsController#index - Always indicate if Knative is installed, not installed or checking - Always indicate the partial response for functions. Final response is guaranteed when knative_installed is either true | false. Adds specs for Clusters::Cluster#knative_services_finder Fix method name when calling on specs Add an explicit check for functions Added an explicit check to see if there are any functions available Fix Serverless feature spec - we don't find knative installation via database anymore, rather via Knative resource Display error message for request timeouts Display an error message if the request times out Adds feature specs for when functions exist Remove a test purposed hardcoded flag Add ability to partially load functions Added the ability to partially load functions on the frontend Add frontend unit tests Added tests for the new frontend additions Generate new translations Generated new frontend translations Address review comments Cleaned up the frontend unit test. Added computed prop for `isInstalled`. Move string to constant Simplify nil to array conversion Put knative_installed states in a frozen hash for better read Pluralize list of Knative states Quey services and pods filtering name This way we don't need to filter the namespace in memory. Also, the data we get from the network is much smaller. Simplify cache_key and fix bug - Simplifies the cache_key by removing namespace duplicate - Fixes a bug with reactive_cache memoization
* | | | Merge branch 'introduce-auto-merge-process-worker' into 'master'Thong Kuah2019-06-041-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Introduce sidekiq worker for auto merge process See merge request gitlab-org/gitlab-ce!28780
| * | | | Introduce sidekiq worker for auto merge processintroduce-auto-merge-process-workerShinya Maeda2019-06-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | As we have a central domain for auto merge process today, we should use a single worker for any auto merge process.
* | | | | Merge branch ↵Kamil Trzciński2019-06-041-8/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'set-real-next-run-at-for-preventing-duplciate-pipeline-creations' into 'master' Make pipeline schedule worker resilient Closes gitlab-com/gl-infra/production#805 and #61955 See merge request gitlab-org/gitlab-ce!28407
| * | | | | Make pipeline schedule worker resilientset-real-next-run-at-for-preventing-duplciate-pipeline-creationsShinya Maeda2019-06-031-8/+17
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, pipeline schedule worker is unstable because it's sometimes killed by excessive memory consumption. In order to improve the performance, we add the following fixes: 1. next_run_at is always real_next_run, which means the value always takes into account of worker's cron schedule 1. Remove exlusive lock. This is already covered by real_next_run change. 1. Use RunPipelineScheduleWorker for avoiding memory killer. Memory consumption is spread to the multiple sidekiq worker.
* | | | | Merge branch 'ce-fe-fix-ee-diff-profile-key-views' into 'master'Bob Van Landuyt2019-06-041-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Resolve EE/CE differences in app/views/profiles/keys See merge request gitlab-org/gitlab-ce!28900
| * | | | Resolved EE differences in app/views/profiles/keysce-fe-fix-ee-diff-profile-key-viewsPaul Slaughter2019-05-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **How?** It creates a base method `can_delete?` on Key which will always be true in CE and is overridden in EE. Added changelog entry
* | | | | Bump Gitaly version to 1.44.0Douwe Maan2019-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes sure Gitaly includes a fix to make rebase work again properly. Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/62353
* | | | | Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-031-21/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically update MR merge-ref along merge status Closes #58495 See merge request gitlab-org/gitlab-ce!28513
| * | | | | Add payload to the service responseOswaldo Ferreira2019-05-311-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces payload to the ServiceResponse with the merge ref HEAD commit data
| * | | | | Simplify merge_ref_head methodsOswaldo Ferreira2019-05-311-6/+4
| | | | | |
| * | | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-05-311-21/+21
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-5-2' into 'master'Kamil Trzciński2019-06-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.5.2/11.11.2 See merge request gitlab-org/gitlab-ce!29050
| * | | | | Update GitLab Runner Helm Chart to 0.5.2update-gitlab-runner-helm-chart-to-0-5-2Tomasz Maczukin2019-06-031-1/+1
| | | | | |
* | | | | | Cleans up UpdateProjectStatistics concernMayra Cabrera2019-06-033-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Renames attributes from stat to project_statistiscs_name and attribute to statistic_attribute - Reordes methods on UpdateProjectStatistics concern - Removes unused module from Ci::Build
* | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-033-0/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'security-fix_milestones_search_api_leak' into 'master'GitLab Release Tools Bot2019-06-031-0/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve: Milestones leaked via search API Closes #2822 See merge request gitlab/gitlabhq!2997
| | * | | | | Resolve: Milestones leaked via search APIFelipe Artur2019-05-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone titles being leaked using search API when users cannot read milestones
| * | | | | | Merge branch 'security-60039' into 'master'GitLab Release Tools Bot2019-06-031-0/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow invalid MR branch name See merge request gitlab/gitlabhq!3052
| | * | | | | | Validate MR branch namesMark Chao2019-05-031-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents refspec as branch name, which would bypass branch protection when used in conjunction with rebase. HEAD seems to be a special case with lots of occurrence, so it is considered valid for now. Another special case is `refs/head/*`, which can be imported.
| * | | | | | | Add DNS rebinding protection settingsOswaldo Ferreira2019-05-301-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'ac-graphql-stats' into 'master'Dmitriy Zaporozhets2019-06-031-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Namespace and ProjectStatistics to GraphQL API See merge request gitlab-org/gitlab-ce!28277
| * | | | | | | | Add Namespace and ProjectStatistics to GraphQL APIAlessio Caiazza2019-06-031-0/+2
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can query namespaces, and nested projects. Projects now exposes statistics
* | | | | | | | Abstract auto merge processesShinya Maeda2019-06-031-6/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have one auto merge strategy today - Merge When Pipeline Succeeds. In order to add more strategies for Merge Train feature, we abstract the architecture to be more extensible. Removed arguments Fix spec
* | | | | | | Merge branch '56959-drop-project_auto_devops_domain' into 'master'Robert Speicher2019-05-311-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes project_auto_devops#domain column Closes #56959 See merge request gitlab-org/gitlab-ce!28574
| * | | | | | | Ignore ProjectAutoDevops domain columnThong Kuah2019-05-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column is no longer used. The form was removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580 and other usages removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28460. Remove final usages of :domain
* | | | | | | | Merge branch 'dz-scope-project-routes-3' into 'master'Lin Jen-Shin2019-05-311-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Move some project routes under - scope See merge request gitlab-org/gitlab-ce!28830
| * | | | | | | Add /-/ scope to link_reference_patternDmitriy Zaporozhets2019-05-291-0/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Move method into groupWei-Meng Lee2019-05-311-0/+4
| | | | | | |
* | | | | | | Simplify logic using new group notification settings methodWei-Meng Lee2019-05-311-17/+5
| | | | | | |
* | | | | | | Guarantee order of notification settingsWei-Meng Lee2019-05-312-4/+10
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'remove-legacy-artifacts-related-code' into 'master'Kamil Trzciński2019-05-312-93/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove legacy artifact related code Closes #58595 See merge request gitlab-org/gitlab-ce!26475
| * | | | | | Remove legacy artifact related coderemove-legacy-artifacts-related-codeShinya Maeda2019-05-312-93/+29
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | We've already migrated all the legacy artifacts to the new realm, which is ci_job_artifacts table. It's time to remove the old code base that is no longer used.
* | | | | | Change query to work on mysql as well. Also set entire date because setting ↵Luke Picciau2019-05-311-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | only the year can trip 'start_date_should_be_less_than_due_date'
* | | | | | Remove nils from project_statistics.packages_sizeAlessio Caiazza2019-05-311-1/+1
|/ / / / / | | | | | | | | | | | | | | | Now it defaults to 0
* | | | | Merge branch '9121-sort-relative-position' into 'master'docs/create-table-driven-standardsSean McGivern2019-05-301-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support sorting issues using `relative_position` Closes #62178 See merge request gitlab-org/gitlab-ce!28566
| * | | | | Allow issues to be sorted by relative_positionBrett Walker2019-05-281-3/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | - adding a "Manual" option to the dropdown - show 100 issues list when manually sorting
View Lorry Controller Status