Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'refactor-clusters' into 38464-k8s-apps | Alessio Caiazza | 2017-11-06 | 1 | -0/+2 | |
|\ \ \ | |/ / | ||||||
| * | | Fix spec failure. MySQL does not bite true | Shinya Maeda | 2017-11-03 | 1 | -0/+2 | |
| | | | ||||||
* | | | Add Clusters::Appplications::CheckInstallationProgressService tests | Alessio Caiazza | 2017-11-06 | 1 | -0/+5 | |
| | | | ||||||
* | | | Add Clusters::Applications::Helm tests | Alessio Caiazza | 2017-11-03 | 1 | -0/+35 | |
|/ / | ||||||
* | | Fix some tests | Shinya Maeda | 2017-11-03 | 1 | -15/+3 | |
| | | ||||||
* | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 3 | -1/+8 | |
|\ \ | |/ | ||||||
| * | Ci::Build tag is a trait instead of an own factory | Zeger-Jan van de Weg | 2017-10-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | Minor annoyance of mine, and there were a couple of things wrong, for example: 1. Switching on a property is just a trait 2. It didn't inherrit from its parent Find and replace through the code based fixed all occurances. | |||||
| * | Merge branch 'api-configure-jira' into 'master' | Douwe Maan | 2017-10-26 | 1 | -0/+2 | |
| |\ | | | | | | | | | | | | | | | | | | | Validate username/pw for Jiraservice, require them in the API Closes #36621 See merge request gitlab-org/gitlab-ce!15025 | |||||
| | * | Factories need to set required attributes | Robert Schilling | 2017-10-24 | 1 | -0/+2 | |
| | | | ||||||
| * | | Added ssh fingerprint, gitlab ci and pages information in an instance ↵ | Francisco Lopez | 2017-10-25 | 1 | -0/+5 | |
| |/ | | | | | | | | | | | configuration page Closes #25142 | |||||
* | | specs for controller. Improved validation | Shinya Maeda | 2017-10-31 | 2 | -9/+8 | |
| | | ||||||
* | | specs for services. Improved details. | Shinya Maeda | 2017-10-30 | 3 | -7/+24 | |
| | | ||||||
* | | specs for models. Improved details. | Shinya Maeda | 2017-10-30 | 4 | -38/+85 | |
| | | ||||||
* | | This works | Shinya Maeda | 2017-10-23 | 1 | -34/+34 | |
|/ | ||||||
* | add spec | micael.bergeron | 2017-10-11 | 1 | -0/+6 | |
| | ||||||
* | Merge branch 'tc-geo-read-only-idea' into 'master' | Douwe Maan | 2017-10-07 | 1 | -1/+1 | |
|\ | | | | | | | | | | | | | Create idea of read-only database Closes #37534 See merge request gitlab-org/gitlab-ce!14688 | |||||
| * | Create idea of read-only databasetc-geo-read-only-idea | Toon Claes | 2017-10-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534. | |||||
* | | Find forks within users/namespaces using fork memberships | Bob Van Landuyt | 2017-10-07 | 1 | -0/+5 | |
| | | ||||||
* | | Merge branch 'master' into '37970-ci-sections-tracking' | Kamil Trzciński | 2017-10-07 | 7 | -1/+61 | |
|\ \ | | | | | | | | | | # Conflicts: # db/schema.rb | |||||
| * | | Commenting on image diffs | Felipe Artur | 2017-10-07 | 1 | -0/+5 | |
| |/ | ||||||
| * | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-07 | 4 | -1/+16 | |
| |\ | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | |||||
| | * | Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into ↵ | Douwe Maan | 2017-10-06 | 3 | -1/+15 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add support for GPG subkeys in signature verification Closes #36829 See merge request gitlab-org/gitlab-ce!14517 | |||||
| | | * | Invalidate GpgSignatures associated to GpgKeySubkeys when revoking the GpgKey | Rubén Dávila | 2017-10-05 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Fix some broken specs | Rubén Dávila | 2017-10-05 | 1 | -2/+2 | |
| | | | | ||||||
| | | * | Add some basic specs and refactor model and validations | Rubén Dávila | 2017-10-05 | 2 | -0/+14 | |
| | | | | ||||||
| | * | | Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master' | Grzegorz Bizon | 2017-10-06 | 1 | -0/+1 | |
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | Move to CE some EE pipelines-related code that belongs to CE Closes gitlab-ee#3616 See merge request gitlab-org/gitlab-ce!14699 | |||||
| | | * | Add feature specs for pipeline failure reason badge | Grzegorz Bizon | 2017-10-05 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-10-05 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | |||||
| | * | | Merge branch 'master' into ↵ | Douwe Maan | 2017-10-05 | 5 | -1/+44 | |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | digitalmoksha/gitlab-ce-feature/verify_secondary_emails # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb | |||||
| | * | | Make GPG signature verification work with non-primary email (#36959) | Brett Walker | 2017-09-23 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | integrate_cluster_service_spec. provision_cluster_service_spec. ↵ | Shinya Maeda | 2017-10-05 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | update_cluster_service_spec. | |||||
| * | | | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-05 | 1 | -1/+1 | |
| |\ \ \ | | | |/ | | |/| | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | |||||
| * | | | Remove status enum from Gcp::Cluster, use state_machine#state | Kamil Trzcinski | 2017-10-04 | 1 | -0/+6 | |
| | | | | ||||||
| * | | | Add spec/models/gcp/cluster_spec.rb | Shinya Maeda | 2017-10-04 | 1 | -0/+23 | |
| | | | | ||||||
* | | | | Add CI build trace sections extractor | Alessio Caiazza | 2017-10-05 | 1 | -0/+6 | |
| |/ / |/| | | ||||||
* | | | Let fetch_ref pull from Gitaly instead of from disk | Jacob Vosmaer | 2017-10-04 | 1 | -1/+1 | |
|/ / | ||||||
* | | Add a factory for `Gitaly::GitCommit`s | Alejandro Rodríguez | 2017-09-30 | 2 | -0/+26 | |
| | | ||||||
* | | Merge branch 'hashed-storage-migration-path' into 'master' | Douwe Maan | 2017-09-28 | 1 | -0/+10 | |
|\ \ | | | | | | | | | | | | | | | | | | | Hashed storage migration path Closes gitlab-ee#3118 See merge request gitlab-org/gitlab-ce!14067 | |||||
| * | | Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-path | Gabriel Mazetto | 2017-09-28 | 1 | -1/+7 | |
| | | | ||||||
| * | | [Backported from EE] Readonly flag for Projects | Gabriel Mazetto | 2017-09-28 | 1 | -0/+4 | |
| |/ | | | | | | | | | This is used in EE for the storage migration, and we want to use this in CE as well to be able to migrate projects to hashed_storage. | |||||
* | | Support custom attributes on users | Markus Koller | 2017-09-28 | 1 | -0/+7 | |
|/ | ||||||
* | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-09-07 | 1 | -0/+4 | |
|\ | | | | | | | zj/gitlab-ce-zj-auto-devops-table | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-09-06 | 8 | -13/+66 | |
| |\ | | | | | | | | | | ee_issue_928_backport | |||||
| * | | Backport specs | Felipe Artur | 2017-08-31 | 1 | -0/+4 | |
| | | | ||||||
* | | | Add tests to cover all introduced changes | Kamil Trzcinski | 2017-09-06 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into zj-auto-devops-table | Zeger-Jan van de Weg | 2017-09-06 | 6 | -11/+17 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | use new #verification_status | Alexis Reigel | 2017-09-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | Remove ci_trigger_request_with_variables | Shinya Maeda | 2017-09-04 | 3 | -9/+1 | |
| | | | ||||||
| * | | Fix spec | Shinya Maeda | 2017-09-04 | 2 | -6/+5 | |
| | | | ||||||
| * | | Revert autheticate! in Trigger API | Shinya Maeda | 2017-09-04 | 2 | -10/+9 | |
| | | |