Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use heredoc for long strings so it's easier to readuse-heredoc-for-keys | Lin Jen-Shin | 2018-01-03 | 1 | -27/+36 |
| | |||||
* | Extend Cluster Applications to allow installation of Prometheus | Mayra Cabrera | 2017-12-22 | 2 | -36/+4 |
| | |||||
* | Use gitlab-styles | Rémy Coutable | 2017-12-22 | 1 | -0/+1 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_rails | Rémy Coutable | 2017-12-14 | 100 | -102/+102 |
| | | | | | | | | | | | I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Adds ordering to projects contributors in API | Jacopo | 2017-12-13 | 1 | -3/+16 |
| | | | | | | | Allows ordering in GET api/v4/projects/:project_id/repository/contributors through `order_by` and `sort` params. The available `order_by` options are: name|email|commits. The available `sort` options are: asc|desc. | ||||
* | Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ↵ | Douwe Maan | 2017-12-08 | 1 | -0/+4 |
| | | | | | | | | | | | 'security-10-2' Fixes project visibility guidelines See merge request gitlab/gitlabhq!2226 (cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c) e4fd1c26 Ensure project wiki visibility guidelines are met | ||||
* | adding view and feature specs | micael.bergeron | 2017-12-07 | 1 | -2/+8 |
| | |||||
* | Support uploads for groups | Jarka Kadlecova | 2017-12-07 | 1 | -0/+16 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into list-multiple-clusters | Matija Čupić | 2017-12-05 | 3 | -23/+47 |
|\ | |||||
| * | Merge branch 'feature/custom-text-for-new-projects' into 'master' | Rémy Coutable | 2017-12-05 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | | | | | Add custom brand text on new project pages Closes #15265 See merge request gitlab-org/gitlab-ce!15541 | ||||
| | * | Add custom brand text on new project pages | Markus Koller | 2017-12-04 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'zj-multiple-artifacts' into 'master' | Grzegorz Bizon | 2017-12-05 | 2 | -23/+46 |
| |\ \ | | | | | | | | | | | | | | | | | Multiple artifacts See merge request gitlab-org/gitlab-ce!14367 | ||||
| | * | | Fix failures | Kamil Trzcinski | 2017-12-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix factory for artifacts | Kamil Trzcinski | 2017-12-03 | 1 | -11/+9 |
| | | | | |||||
| | * | | Fix specs failures, and use factory with `:ci_job_artifact, :archive` | Kamil Trzcinski | 2017-12-03 | 2 | -15/+17 |
| | | | | |||||
| | * | | Rename artifacts_* to legacy_artifacts_* | Kamil Trzcinski | 2017-12-03 | 1 | -0/+11 |
| | | | | |||||
| | * | | Fix most test failures | Zeger-Jan van de Weg | 2017-12-03 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fix creation of job_artifact_uploader | Kamil Trzcinski | 2017-12-03 | 2 | -4/+8 |
| | | | | |||||
| | * | | Rename Artifact to JobArtifact, split metadata out | Zeger-Jan van de Weg | 2017-12-03 | 3 | -27/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two things at ones, as there was no clean way to seperate the commit and give me feedback from the tests. But the model Artifact is now JobArtifact, and the table does not have a type anymore, but the metadata is now its own model: Ci::JobArtifactMetadata. | ||||
| | * | | Create Ci::Artifacts | Zeger-Jan van de Weg | 2017-12-03 | 2 | -23/+26 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow jobs/builds to have multiple artifacts, and to start seperating concerns from Ci::Build a new model is created: Ci::Artifact. Changes include the updating of the ArtifactUploader to adapt to a slightly different interface. The uploader expects to be initialized with a `Ci::Build`. Futher a migration with the minimal fields, the needed foreign keys and an index. Last, the way this works is by prepending a module to Ci::Build so we can basically override behaviour but if needed use `super` to get the original behaviour. | ||||
| * | | Second iteration of Move Kubernetes from service to Cluster page | Filipa Lacerda | 2017-12-05 | 1 | -11/+4 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/list-multiple-clusters' into ↵ | Kamil Trzcinski | 2017-12-03 | 1 | -0/+4 |
|\ \ | | | | | | | | | | cluster-page-with-list-clusters | ||||
| * | | Refactor disabled cluster testing to use trait | Matija Čupić | 2017-12-01 | 1 | -0/+4 |
| |/ | |||||
* | | Yet another specs | Kamil Trzcinski | 2017-12-03 | 1 | -0/+0 |
| | | |||||
* | | Split views | Kamil Trzcinski | 2017-12-03 | 1 | -11/+4 |
|/ | |||||
* | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master' | Rémy Coutable | 2017-11-20 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188 | ||||
| * | Adds Rubocop rule for line break after guard clause | Jacopo | 2017-11-16 | 1 | -0/+1 |
| | | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses. | ||||
* | | Delete the fork network when removing the last membership | Bob Van Landuyt | 2017-11-17 | 1 | -0/+8 |
|/ | |||||
* | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2017-11-07 | 1 | -0/+1 |
|\ | | | | | | | into add-ingress-to-cluster-applications | ||||
| * | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-08 | 1 | -0/+1 |
| |\ | |||||
| | * | Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master' | Kamil Trzciński | 2017-11-07 | 1 | -0/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that every job has a stage assigned Closes #37979 See merge request gitlab-org/gitlab-ce!14724 | ||||
| | | * | Extract ensure stage service from commit status class | Grzegorz Bizon | 2017-11-06 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/38464-k8s-apps' into ↵ | Kamil Trzcinski | 2017-11-07 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | | | | | | | | | add-ingress-to-cluster-applications | ||||
| * | | | Fix rubocop warning | Alessio Caiazza | 2017-11-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix ingress rubocop failure | Kamil Trzcinski | 2017-11-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add specs for ingress | Kamil Trzcinski | 2017-11-07 | 1 | -0/+35 |
|/ / / | |||||
* | | | Fix tests for initial status | Kamil Trzcinski | 2017-11-07 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Shinya Maeda | 2017-11-07 | 1 | -6/+1 |
|\ \ \ | | | | | | | | | | | | | into 38464-k8s-apps | ||||
| * | | | Fix cluster_applications_helm factory with a configured cluster | Alessio Caiazza | 2017-11-07 | 1 | -6/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-07 | 2 | -0/+14 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master' | Rémy Coutable | 2017-11-07 | 2 | -0/+14 |
| |\ \ | | | | | | | | | | | | | | | | | Support custom attributes on groups and projects See merge request gitlab-org/gitlab-ce!14593 | ||||
| | * | | Support custom attributes on groups | Markus Koller | 2017-11-06 | 1 | -0/+7 |
| | | | | |||||
| | * | | Support custom attributes on projects | Markus Koller | 2017-11-06 | 1 | -0/+7 |
| | |/ | |||||
* | | | Revert "Fix cluster_applications_helm factory as cluster always has been ↵ | Shinya Maeda | 2017-11-07 | 1 | -6/+11 |
| | | | | | | | | | | | | | | | | | | cerated" This reverts commit 36d69130a2337458a2fec94665d9369feb7a2f02. | ||||
* | | | Fix cluster_applications_helm factory as cluster always has been cerated | Shinya Maeda | 2017-11-07 | 1 | -11/+6 |
| | | | |||||
* | | | Rename application_helm factory to cluster_application_helm | Alessio Caiazza | 2017-11-07 | 1 | -6/+2 |
| | | | |||||
* | | | Merge branch 'master' into 38464-k8s-apps | Eric Eastwood | 2017-11-06 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: db/schema.rb | ||||
| * | | Merge branch 'refactor-clusters' into 'master' | Grzegorz Bizon | 2017-11-06 | 4 | -38/+91 |
| |\ \ | | | | | | | | | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879 | ||||
| * | | | ignore the column before the migration | micael.bergeron | 2017-11-06 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | | | | reword the changelog remove dead code in the specs | ||||
* | | | Merge branch 'refactor-clusters' into 38464-k8s-apps | Alessio Caiazza | 2017-11-06 | 3 | -6/+6 |
|\ \ \ | | |/ | |/| |