summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Update gitlab runner helm chart to 0.1.39Tomasz Maczukin2018-12-071-1/+1
|
* Truncate merge request titles with periods instead of ellipsisStan Hu2018-12-061-1/+3
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54862
* Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"Robert Speicher2018-12-061-1/+1
| | | | | This reverts commit 1e8f1de034aa9b6a60b640b2b091f60c4d3ba365, reversing changes made to 62d971129da99936a3cdc04f3740d26f16a0c7a6.
* Merge branch '19376-post-bfg-cleanup' into 'master'Douglas Barbosa Alexandre2018-12-061-0/+8
|\ | | | | | | | | | | | | Allow internal references to be removed Closes #19376 See merge request gitlab-org/gitlab-ce!23189
| * Use BFG object maps to clean projectsNick Thomas2018-12-061-0/+8
| |
* | Introduce Knative Serverless TabDylan Griffith2018-12-062-2/+44
|/
* Sort issues and merge requests in ascending and descending orderFatih Acet2018-12-062-17/+24
|
* Merge branch 'expose-mr-pipeline-variables' into 'master'Kamil Trzciński2018-12-062-7/+48
|\ | | | | | | | | Expose merge request pipeline variables See merge request gitlab-org/gitlab-ce!23398
| * Expose merge request pipeline variablesShinya Maeda2018-12-062-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the following variables - CI_MERGE_REQUEST_ID - CI_MERGE_REQUEST_IID - CI_MERGE_REQUEST_REF_PATH - CI_MERGE_REQUEST_PROJECT_ID - CI_MERGE_REQUEST_PROJECT_PATH - CI_MERGE_REQUEST_PROJECT_URL - CI_MERGE_REQUEST_TARGET_BRANCH_NAME - CI_MERGE_REQUEST_SOURCE_PROJECT_ID - CI_MERGE_REQUEST_SOURCE_PROJECT_PATH - CI_MERGE_REQUEST_SOURCE_PROJECT_URL - CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
* | Resolve "Can add an existing group member into a group project with new ↵James Lopez2018-12-062-0/+21
| | | | | | | | permissions but permissions are not overridden"
* | Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'Kamil Trzciński2018-12-061-1/+1
|\ \ | |/ |/| | | | | | | | | Encrypt CI/CD builds tokens Closes #52342 See merge request gitlab-org/gitlab-ce!23436
| * Encrypt builds token by default with insecure fallbackGrzegorz Bizon2018-12-051-1/+1
| |
* | Merge branch '34758-deployment-cluster' into 'master'Kamil Trzciński2018-12-055-10/+72
|\ \ | | | | | | | | | | | | Use group clusters when deploying (DeploymentPlatform) See merge request gitlab-org/gitlab-ce!22308
| * | Eager load clusters to prevent N+1Thong Kuah2018-12-051-1/+2
| | | | | | | | | | | | | | | | | | This also means we need to apply the `current_scope` otherwise this method will return all clusters associated with the groups regardless of any scopes applied to this method
| * | Unify into :group_clusters feature flagThong Kuah2018-12-054-2/+8
| | | | | | | | | | | | | | | | | | | | | With this MR, group clusters is now functional, so default to enabled. Have a single setting on the root ancestor group to enabled or disable group clusters feature as a whole
| * | Various improvements to hierarchy sortingThong Kuah2018-12-054-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Rename ordered_group_clusters_for_project -> ancestor_clusters_for_clusterable - Improve name of order option. It makes much more sense to have `hierarchy_order: :asc` and `hierarchy_order: :desc` - Allow ancestor_clusters_for_clusterable for group - Re-use code already present in Project
| * | Create k8s namespace for project in group clustersThong Kuah2018-12-052-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AFAIK the only relevant place is Projects::CreateService, this gets called when user creates a new project, forks a new project and does those things via the api. Also create k8s namespace for new group hierarchy when transferring project between groups Uses new Refresh service to create k8s namespaces - Ensure we use Cluster#cluster_project If a project has multiple clusters (EE), using Project#cluster_project is not guaranteed to return the cluster_project for this cluster. So switch to using Cluster#cluster_project - at this stage a cluster can only have 1 cluster_project. Also, remove rescue so that sidekiq can retry
| * | Teach Cluster about #all_projectsThong Kuah2018-12-051-0/+10
| | | | | | | | | | | | | | | For project level, it's the project directly associated. For group level, it's the projects under that group.
| * | Teach Project about #all_clustersThong Kuah2018-12-052-0/+7
| | | | | | | | | | | | | | | This returns a union of the project level clusters and group level clusters associated with this project.
| * | Add association project -> kubernetes_namespacesThong Kuah2018-12-051-0/+1
| | | | | | | | | | | | | | | kubernetes_namespaces is not needed for project import/export as it tracks internal state of kubernetes integration
| * | Deploy to clusters for a project's groupsThong Kuah2018-12-052-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look for matching clusters starting from the closest ancestor, then go up the ancestor tree. Then use Ruby to get clusters for each group in order. Not that efficient, considering we will doing up to `NUMBER_OF_ANCESTORS_ALLOWED` number of queries, but it's a finite number Explicitly order query by depth This allows us to control ordering explicitly and also to reverse the order which is useful to allow us to be consistent with Clusters::Cluster.on_environment (EE) which does reverse ordering. Puts querying group clusters behind Feature Flag. Just in case we have issues with performance, we can easily disable this
* | | Rename project's pipelines relationFrancisco Javier López2018-12-056-14/+29
| | |
* | | Merge branch 'fix/gb/improve-timeout-inputs-help-sections' into 'master'Kamil Trzciński2018-12-053-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve help and validation sections of maximum build timeout inputs Closes #49434 See merge request gitlab-org/gitlab-ce!23586
| * | | Add custom validation message for chronic duration attributeGrzegorz Bizon2018-12-053-3/+5
| | |/ | |/|
* | | Merge branch 'mr-pipelines-2' into 'master'Kamil Trzciński2018-12-053-6/+31
|\ \ \ | | | | | | | | | | | | | | | | Merge request pipelines See merge request gitlab-org/gitlab-ce!23217
| * | | Change merge request value to 10Shinya Maeda2018-12-051-1/+1
| | | |
| * | | Merge request pipelinesShinya Maeda2018-12-053-6/+31
| | |/ | |/|
* | | Merge branch 'bw-serializer-tech-debit-2' into 'master'Douwe Maan2018-12-051-14/+0
|\ \ \ | |_|/ |/| | | | | | | | Extract code into IssueBoardEntity / serializer (follow up) See merge request gitlab-org/gitlab-ce!23511
| * | Extract code into IssueBoardEntityBrett Walker2018-12-041-14/+0
| | |
* | | Merge branch '53659-use-padded-key-for-gcm-ciphers' into 'master'Rémy Coutable2018-12-051-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use a 32-byte version of db_key_base for web hooks Closes #53659 See merge request gitlab-org/gitlab-ce!23573
| * | | Use a 32-byte version of db_key_base for web hooksNick Thomas2018-12-051-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AES-256-GCM cipher mode requires a key that is exactly 32 bytes long. We already handle the case when the key is too long, by truncating, but the key can also be too short in some installations. Switching to a key that is always exactly the right length (by virtue of right-padding ASCII 0 characters) allows encryption to proceed, without breaking backward compatibility. When the key is too short, encryption fails with an `ArgumentError`, causing the web hooks functionality to be unusable. As a result, zero rows can exist with values encrypted with the too-short key. When the key is too long, it is silently truncated. In this case, the key is unchanged, so values encrypted with the new too-long key will still be successfully decrypted.
* | | Merge branch 'set-kubeconfig-nil-when-token-nil' into 'master'Dmitriy Zaporozhets2018-12-053-9/+3
|\ \ \ | | | | | | | | | | | | | | | | Make KUBECONFIG nil if KUBE_TOKEN is nil See merge request gitlab-org/gitlab-ce!23414
| * | | Make KUBECONFIG nil if KUBE_TOKEN is nilDylan Griffith2018-11-303-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having an invalid KUBECONFIG without a token in it is not helpful. This only became possible recently now that we are creating a separate namespace and service account (and hence token) to send to the runners. This led to somewhat surprising results when troubleshooting https://gitlab.com/gitlab-org/gitlab-ce/issues/53879 as I found that the KUBECONFIG was still being passed but KUBE_TOKEN was not. These things really should have been linked. Furthermore now that we are also using the [presence of KUBECONFIG to decide whether or not to run build steps in Auto DevOps](https://gitlab.com/gitlab-org/gitlab-ce/blob/294d15be3e9497e7b67e1f9131ce9d5c0d68406c/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml#L164) I think it makes even more sense to ensure that KUBECONFIG is a complete config if passed to a job.
* | | | Add Project#lfs_http_url_to_repo from EEAsh McKenzie2018-12-051-0/+5
| |/ / |/| | | | | | | | | | | For CE, #lfs_http_url_to_repo calls #http_url_to_repo where as for EE we examine for a Geo setup so we can support push to secondary for LFS.
* | | Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas2018-12-047-23/+152
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Encrypt runners tokens Closes #51232 and #52931 See merge request gitlab-org/gitlab-ce!23412
| * | | Fix typo in encrypted token authenticatable strategyGrzegorz Bizon2018-12-041-1/+1
| | | |
| * | | Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into ↵Grzegorz Bizon2018-12-0410-25/+61
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix/gb/encrypt-runners-tokens * commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81': (101 commits)
| * | | | Fix token_set? method by checking migration statusGrzegorz Bizon2018-12-041-1/+4
| | | | |
| * | | | Use plaintext token when migration is not completeGrzegorz Bizon2018-12-031-4/+6
| | | | |
| * | | | Refactor encrypted token strategy classGrzegorz Bizon2018-12-031-26/+31
| | | | |
| * | | | Fix token encrypted strategy when migrating dataGrzegorz Bizon2018-12-031-1/+7
| | | | |
| * | | | Migrate runners token first before fully switchingGrzegorz Bizon2018-12-033-3/+3
| | | | |
| * | | | Implement migration strategy for token authenticatableGrzegorz Bizon2018-12-032-4/+25
| | | | |
| * | | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into ↵Grzegorz Bizon2018-11-299-39/+43
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/gb/encrypt-runners-tokens * commit '6852680584a1b22788f451457a6042eabf862a73': (57 commits)
| * \ \ \ \ Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-2819-290/+202
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (243 commits) Conflicts: db/schema.rb lib/gitlab/import_export/import_export.yml
| * | | | | | Expire application settings after encrypting tokensGrzegorz Bizon2018-11-281-0/+3
| | | | | | |
| * | | | | | Fix resetting old token when fallback strategy is providedGrzegorz Bizon2018-11-271-1/+1
| | | | | | |
| * | | | | | Improve token authenticable tests and exceptionsGrzegorz Bizon2018-11-272-5/+5
| | | | | | |
| * | | | | | Improve test cases description in token-related specsGrzegorz Bizon2018-11-231-5/+3
| | | | | | |
| * | | | | | Only allow valid options when configuring tokensGrzegorz Bizon2018-11-231-0/+4
| | | | | | |
View Lorry Controller Status