summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński2018-11-0231-282/+444
|\ | | | | | | | | Top level clusters controller See merge request gitlab-org/gitlab-ce!22438
| * Use polymorphic_paths where we cantop_level_clusters_controllerThong Kuah2018-11-022-28/+4
| | | | | | | | | | | | | | To reduce the number of abstract methods, use polymorphic_paths for collection routes. Unfortunately for member routes, polymorphic_paths does not support namespaced classes, so still continue to override methods.
| * Remove method as using nested resource routesThong Kuah2018-11-026-11/+0
| | | | | | | | | | | | We introduced hidden_clusterable_fields in this MR but it is no longer needed as we have gone back to nested resource routes which should provide the params such as `project_id`.
| * Add missing specs for PresenterThong Kuah2018-11-021-0/+20
| | | | | | | | Also add missing interface in abstract class.
| * Resolve controller sharing concernThong Kuah2018-11-0130-81/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ClustersController as base while having Projects::ClustersController to inform what `clusterable` is. Thanks @ayufan for the great suggestion ! - View changes to work with new approach - Fix javascript for new approach - Fix feature specs for new approach - Fix QA
| * Restore 403 functionality for external auth (EE)Thong Kuah2018-11-014-9/+23
| | | | | | | | | | | | | | | | | | | | When we unhooked ClustersController from Project::ApplicationsController, we missed an EE override to handle_not_found_or_authorized. Rather than carry on with override RoutingActions, make a specific proc for Project that we override in EE instead. Use that proc in both Clusters::BaseController and Project::ApplicationsController.
| * Move view and path concerns to presentersThong Kuah2018-11-0110-59/+77
| | | | | | | | | | | | | | - Move show path for cluster to ClusterPresenter - Create ClusterablePresenter to encapsulate logic. Consolidates scattered methods from BaseController and ClustersHelper into an object.
| * Abstract out project out of ClustersControllerThong Kuah2018-11-0115-54/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To the extent possible swap out `project` with `clusterable` - Abstract paths for showing cluster or clusters. This will allow us to swap in alternative paths for group level cluster - Push :project_id and :namespace_id params from the URL to the POST body. - Create a nice helper for to generate links for the destroy action For some reason, spec :project_id and :namespace_id param are not going through `to_param` for a JSON format. Manually call `to_param` to fix specs. - Move :layout to BaseController
| * Convert clusters to use a top-level controllerThong Kuah2018-11-0128-27/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation so that we can create both cluster attached to project and cluster attached to group. - Move ClustersController to top level - Move Clusters::ApplicationsController to top-level too - Creates a Clusters::BaseController to share common functions - Do not rely on @project ivar. Anything could set the ivar. - Fix Vue page components due to new data-page value Because of the controller change we have gone from `projects:clusters:new` to `clusters:new`, so we need to update the file location of the page components. There is somewhere a function that will convert data-page to a file location. On that note, projects/clusters/gcp/new/, translate to Projects::Clusters::Gcp#new doesn't exist so replace that with clusters/create_gcp/ and clusters/create_user/
* | Merge branch '28249-add-pagination' into 'master'Kamil Trzciński2018-11-026-42/+68
|\ \ | | | | | | | | | | | | | | | | | | Adds pagination to pipelines table in merge request & commit page Closes #28249 See merge request gitlab-org/gitlab-ce!22696
| * | Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-316-42/+68
| | |
* | | Add scheduled flag to job entityShinya Maeda2018-11-022-1/+7
| | |
* | | Merge branch 'ce-jej/group-saml-discovery-token' into 'master'Kamil Trzciński2018-11-022-3/+10
|\ \ \ | | | | | | | | | | | | | | | | TokenAuthenticatable allows non-unique tokens See merge request gitlab-org/gitlab-ce!22748
| * | | TokenAuthenticatable allows non-unique tokensce-jej/group-saml-discovery-tokenJames Edwards-Jones2018-10-312-3/+10
| | | | | | | | | | | | | | | | | | | | Avoids needing an index to repeatedly check that the token doesn't already exist when saving.
* | | | Remove ci_enable_scheduled_build feature flagShinya Maeda2018-11-021-2/+1
| | | |
* | | | Merge branch 'sh-optimize-reload-diffs-service' into 'master'Sean McGivern2018-11-021-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Significantly cut memory and SQL queries when reloading diffs See merge request gitlab-org/gitlab-ce!22725
| * | | | Avoidp loading merge request diff files when not neededStan Hu2018-11-011-1/+1
| | | | |
| * | | | Significantly cut memory usage and SQL queries when reloading diffsStan Hu2018-11-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By preloading certain models with the diff, we can eliminate many N+1 queries. For a push to the staging GitLab.com www-gitlab-com repository, this eliminates over 3000 SQL queries and appears to bring down the RSS usage by several gigabytes. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* | | | | Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' ↵Sean McGivern2018-11-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Links in tabs of the labels index pages ends with `.html`" Closes #52548 See merge request gitlab-org/gitlab-ce!22716
| * | | | | Fix bug when links in tabs of the labels index pages ends with .htmlDmitriy Zaporozhets2018-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Remove gitlab-ui's progress bar from globalClement Ho2018-11-022-2/+5
| | | | | |
* | | | | | Merge branch 'replace-tooltip-in-markdown-component' into 'master'Clement Ho2018-11-012-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace tooltip in markdown component with gl-tooltip See merge request gitlab-org/gitlab-ce!21989
| * | | | | | Replace tooltip in markdown component with gl-tooltipGeorge Tsiolis2018-10-312-10/+10
| | | | | | |
* | | | | | | Merge branch 'user-model-merge-conflicts' into 'master'Robert Speicher2018-11-012-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce merge conflicts in the User model See merge request gitlab-org/gitlab-ce!22697
| * | | | | | | Use a method for the has_many :keys in Projectuser-model-merge-conflictsYorick Peterse2018-11-012-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the `where` in the `has_many :keys` association in Project to the Key model. This allows EE to override this method, instead of modifying the source code directly.
| * | | | | | | Move LDAP sync time constant to a methodYorick Peterse2018-11-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the `1.hour` constant used as the LDAP sync time to a separate method. This allows EE to override this method using a module, instead of directly modifying the source code.
* | | | | | | | Merge branch 'ee-8121-geo-search-bar' into 'master'Douglas Barbosa Alexandre2018-11-011-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport from Added a search bar to `Admin > Geo > Projects` See merge request gitlab-org/gitlab-ce!22747
| * | | | | | | | Add render_if_exists to inject additional search field in EEGabriel Mazetto2018-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows EE code to reuse the search partial and append additional query parameters to it, and have it preserved when searching.
* | | | | | | | | Merge branch 'winh-job-list-dynamic-timer' into 'master'Clement Ho2018-11-012-3/+19
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic timer for delayed jobs in job list See merge request gitlab-org/gitlab-ce!22656
| * | | | | | | | Add dynamic timer for delayed jobs in job listwinh-job-list-dynamic-timerWinnie Hellmann2018-11-012-3/+19
| | | | | | | | |
* | | | | | | | | Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern2018-11-014-12/+59
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix testsHeinrich Lee Yu2018-11-012-23/+10
| | | | | | | | |
| * | | | | | | | Add None / Any options to search barHeinrich Lee Yu2018-11-012-0/+18
| | | | | | | | |
| * | | | | | | | Add None / Any options to reaction filter in issues / MRs APIHeinrich Lee Yu2018-11-012-10/+52
| | | | | | | | |
* | | | | | | | | Merge branch '52382-filter-milestone-api-none-any' into 'master'Sean McGivern2018-11-012-18/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Filter by `None`/`Any` for milestone in issues/mrs API" Closes #52382 See merge request gitlab-org/gitlab-ce!22637
| * | | | | | | | | Rearrange code for readabilityHeinrich Lee Yu2018-11-011-16/+18
| | | | | | | | | |
| * | | | | | | | | Update search bar token for None and AnyHeinrich Lee Yu2018-11-011-2/+2
| | | | | | | | | |
| * | | | | | | | | Update API to accept None and AnyHeinrich Lee Yu2018-11-011-13/+13
| |/ / / / / / / /
* | | | | | | | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-0131-38/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
| * | | | | | | | | Fix typos in comments and specsGeorge Tsiolis2018-11-0131-38/+38
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'Sean McGivern2018-11-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce SQL queries needed to load open merge requests See merge request gitlab-org/gitlab-ce!22709
| * | | | | | | | | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-301-1/+1
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SQL queries and memory allocation in MergeRequests::RefreshService is dominated by queries for Project and Route loads. On staging, the absence of an inverse relationship caused Rails to make over 1100 extraneous SQL queries for the www-gitlab-com repository. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* | | | | | | | | Merge branch 'da-rubocop-whitelist-active-record-none' into 'master'Yorick Peterse2018-10-3112-28/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist none method from ActiveRecord::Querying See merge request gitlab-org/gitlab-ce!22726
| * | | | | | | | | Whitelist none method from ActiveRecord::Queryingda-rubocop-whitelist-active-record-noneDouglas Barbosa Alexandre2018-10-3112-28/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'prettify-all-remaining-things' into 'master'Filipa Lacerda2018-10-3162-1593/+1797
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify remaining files with differences in CE and EE See merge request gitlab-org/gitlab-ce!22702
| * | | | | | | | | Fix eslint violationsMike Greiling2018-10-311-1/+1
| | | | | | | | | |
| * | | | | | | | | Prettify remaining files with differences in CE and EEMike Greiling2018-10-3162-1592/+1796
| | | | | | | | | |
* | | | | | | | | | Merge branch 'leipert-migrate-gitlab-svgs' into 'master'Mike Greiling2018-10-313-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgs See merge request gitlab-org/gitlab-ce!22714
| * | | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgsLukas Eipert2018-10-313-3/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master'Annabel Dunstone Gray2018-10-314-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quick links button styles Closes #52220 and #52063 See merge request gitlab-org/gitlab-ce!22657