summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add access controlled pages entry to permissions tabledocs/gitlab-pages-permissionsEvan Read2018-11-051-2/+3
|
* Update CHANGELOG.md for 11.4.5GitLab Release Tools Bot2018-11-043-10/+14
| | | [ci skip]
* Merge branch 'update-def-of-done-with-qa-tests-requirement' into 'master'Evan Read2018-11-041-1/+2
|\ | | | | | | | | | | | | docs - Update definition of done with e2e tests requirement Closes gitlab-org/quality/team-tasks#67 See merge request gitlab-org/gitlab-ce!22655
| * Using inline links per review feedbackupdate-def-of-done-with-qa-tests-requirementSanad Liaquat2018-11-021-4/+2
| |
| * Changed dev stage team to quality teamSanad Liaquat2018-11-011-2/+2
| |
| * Update definition of done with e2e tests requirementSanad Liaquat2018-10-291-0/+3
| |
* | Merge branch 'update_license_management_job' into 'master'Kamil Trzciński2018-11-042-9/+7
|\ \ | | | | | | | | | | | | Update license_management job See merge request gitlab-org/gitlab-ce!22732
| * | Update license_management jobPhilippe Lafoucrière2018-11-042-9/+7
|/ /
* | Merge branch 'patch-32' into 'master'Evan Read2018-11-041-1/+1
|\ \ | | | | | | | | | | | | Update mysql.md with correct anchor link to "how services are linked" See merge request gitlab-org/gitlab-ce!22739
| * | Update mysql.mdAndreas Volkmann2018-11-021-1/+1
| | |
| * | Update mysql.md with correct anchor link to "how services are linked"Andreas Volkmann2018-11-011-1/+1
| | |
* | | Merge branch ↵Stan Hu2018-11-042-5/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53467-transient-failure-in-spec-controllers-groups-boards_controller_spec-rb' into 'master' Resolve "Transient failure in spec/controllers/groups/boards_controller_spec.rb" Closes #53467 See merge request gitlab-org/gitlab-ce!22785
| * | | Fix transient error with boards_controller_spec53467-transient-failure-in-spec-controllers-groups-boards_controller_spec-rbBrett Walker2018-11-032-5/+7
| | | |
* | | | Merge branch 'sh-optimize-mr-commit-sha-lookup' into 'master'Douwe Maan2018-11-036-5/+73
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Optimize merge request refresh by using the database to check commit SHAs See merge request gitlab-org/gitlab-ce!22731
| * | | Optimize merge request refresh by using the database to check commit SHAssh-optimize-mr-commit-sha-lookupStan Hu2018-11-026-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously for a given merge request, we would: 1. Create the array of commit SHAs involved in the push (A) 2. Request all merge request commits and map the SHA (B) 3. Reload the diff if there were any common commits between A and B We can avoid additional database querying and overhead by checking with the database whether the merge request contains any of the commit SHAs. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/53213
* | | | Merge branch 'use-our-own-docker-image-for-helm-install-pods' into 'master'Kamil Trzciński2018-11-025-14/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Use our own docker image for helm install pods See merge request gitlab-org/gitlab-ce!22778
| * | | Use our own docker image for helm install podsuse-our-own-docker-image-for-helm-install-podsDylan Griffith2018-11-025-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | This will reduce dependencies and failure points during installation. It will also reduce security risks from untrusted dependencies being able to effect all our users
* | | | Merge branch 'ccr/51520_change_milestone_email' into 'master'11-5-stable-prepare-rc1Robert Speicher2018-11-0221-5/+399
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add email for milestone change Closes #51520 See merge request gitlab-org/gitlab-ce!22279
| * | | Add email for milestone changeChantal Rollison2018-11-0221-5/+399
|/ / /
* | | Merge branch '51716-create-kube-namespace' into 'master'Kamil Trzciński2018-11-0233-341/+873
|\ \ \ | | | | | | | | | | | | | | | | Incorporates Kubernetes Namespace into Cluster's flow See merge request gitlab-org/gitlab-ce!22011
| * | | Incorporates Kubernetes Namespace into Cluster's flowThong Kuah2018-11-0233-341/+873
|/ / /
* | | Merge branch 'ml-fix-logging-qa' into 'master'Sean McGivern2018-11-022-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Don't log fabricate args See merge request gitlab-org/gitlab-ce!22753
| * | | Don't log fabricate argsMark Lapierre2018-11-022-4/+4
| | | | | | | | | | | | | | | | Prevents logging of sensitive data
* | | | Merge branch 'rd-set-missing-fields-on-migration' into 'master'Douwe Maan2018-11-021-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a migration that causes error on some legacy DBs Closes #46862 See merge request gitlab-org/gitlab-ce!22761
| * | | | Fixes a migration that causes error on some legacy DBsrd-set-missing-fields-on-migrationRubén Dávila2018-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like there are some legacy GitLab databases that have a NOT NULL constraint for the `created_at` and `updated` fields. This change fixes the migration by adding a default value to those columns and I think we always should have it in mind when inserting DB records through raw SQL.
* | | | | Merge branch '51620-cannot-add-label-to-issue-from-board' into 'master'Douwe Maan2018-11-027-4/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cannot add label to issue from board Closes #51620 See merge request gitlab-org/gitlab-ce!22475
| * | | | | Rename to assignable_labels_endpoint51620-cannot-add-label-to-issue-from-boardBrett Walker2018-10-314-4/+4
| | | | | |
| * | | | | Dynamically store the valid label endpointBrett Walker2018-10-317-4/+56
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | In order to ensure we have the right endpoint to query for an issue's possible valid labels, we store that url in the issue object that gets passed to the frontend.
* | | | | Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński2018-11-0243-318/+634
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-027-17/+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-022-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | Also add missing interface in abstract class.
| * | | | | Resolve controller sharing concernThong Kuah2018-11-0138-107/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0113-60/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-0118-75/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0138-62/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0210-42/+98
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3110-42/+98
| | | | | | |
* | | | | | | Merge branch 'add-scheduled-flag-to-job-entity' into 'master'Kamil Trzciński2018-11-025-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add scheduled flag to job entity See merge request gitlab-org/gitlab-ce!22710
| * | | | | | | Add scheduled flag to job entityShinya Maeda2018-11-025-1/+17
|/ / / / / / /
* | | | | | | 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.
* | | | | | | | Merge branch 'remove-ci_enable_scheduled_build-feature-flag' into 'master'Kamil Trzciński2018-11-025-54/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ci_enable_scheduled_build feature flag Closes #52183 See merge request gitlab-org/gitlab-ce!22742
| * | | | | | | | Remove ci_enable_scheduled_build feature flagShinya Maeda2018-11-025-54/+14
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-optimize-reload-diffs-service' into 'master'Sean McGivern2018-11-026-11/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Significantly cut memory and SQL queries when reloading diffs See merge request gitlab-org/gitlab-ce!22725
| * | | | | | | | Fix merge request specs that expect diff_files to be calledsh-optimize-reload-diffs-serviceStan Hu2018-11-012-8/+8
| | | | | | | | |
| * | | | | | | | Avoidp loading merge request diff files when not neededStan Hu2018-11-012-3/+6
| | | | | | | | |
| * | | | | | | | Significantly cut memory usage and SQL queries when reloading diffsStan Hu2018-11-013-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-023-1/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Links in tabs of the labels index pages ends with `.html`" Closes #52548 See merge request gitlab-org/gitlab-ce!22716