| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-2' into ↵ | Douwe Maan | 2018-01-08 | 2 | -0/+59 |
| | | | | | | | | | | | | 'security-10-2' [10.2] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2275 (cherry picked from commit b07115bbf3a6f2340e88213f51f699302e6af1d9) 5382c682 Backport to 10.2 | ||||
| * | Merge branch 'default-values-for-mr-states' into 'master' | Sean McGivern | 2017-11-29 | 3 | -0/+83 |
| | | | | | | | | | | | | Fix defaults for MR states and merge statuses Closes #40534 See merge request gitlab-org/gitlab-ce!15594 (cherry picked from commit 4976225209833899f632853ba7ab81b3c8ce239b) 4beacdb2 Fix defaults for MR states and merge statuses | ||||
| * | Merge branch 'fix-ci-pipelines-index' into 'master' | Yorick Peterse | 2017-11-22 | 1 | -0/+35 |
| | | | | | | | Update composite pipelines index to include "id" See merge request gitlab-org/gitlab-ce!15519 | ||||
| * | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Kamil Trzcinski | 2017-11-07 | 2 | -0/+34 |
| |\ | |||||
| | * | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-07 | 2 | -0/+34 |
| | |\ | |||||
| | | * | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master' | Rémy Coutable | 2017-11-07 | 2 | -0/+34 |
| | | |\ | | | | | | | | | | | | | | | | | 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/+19 |
| | | | | | |||||
| | | | * | Support custom attributes on projects | Markus Koller | 2017-11-06 | 1 | -0/+15 |
| | | | | | |||||
| | * | | | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-07 | 2 | -87/+5 |
| | |\ \ \ | | |/ / | |||||
| * | | | | Add ingress application | Kamil Trzcinski | 2017-11-06 | 1 | -0/+21 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/refactor-clusters' into ↵ | Kamil Trzcinski | 2017-11-06 | 2 | -87/+5 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | 36629-35958-add-cluster-application-section | ||||
| | * | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-05 | 1 | -1/+5 |
| | |\ \ | | |/ | |||||
| | | * | Put a condition to old migration that adds fast_forward column to MRs | Valery Sizov | 2017-11-04 | 1 | -1/+5 |
| | | | | |||||
| | * | | Move migration file to post-migration. Use EachBatch. batch_size 1 | Shinya Maeda | 2017-11-04 | 1 | -90/+0 |
| | | | | |||||
| | * | | Fix MigrateGcpClustersToNewClustersArchitectures. Improve spec | Shinya Maeda | 2017-11-03 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge branch 'refactor-clusters' into 38464-k8s-apps | Alessio Caiazza | 2017-11-03 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Fix tests. Remove NOT NULL constraint from cluster.user. | Shinya Maeda | 2017-11-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-03 | 2 | -0/+104 |
| | |\ \ | | |/ | |||||
| * | | | Merge remote-tracking branch 'origin/master' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-03 | 2 | -0/+104 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' ↵ | Yorick Peterse | 2017-11-02 | 1 | -0/+26 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Add a `merge_request_diff_id` column to `merge_requests`" See merge request gitlab-org/gitlab-ce!15035 | ||||
| | | * | | Add a column linking an MR to its diff | Sean McGivern | 2017-11-02 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We already had this the other way around (merge_request_diffs.merge_request_id), but this is needed to gather only the most recent diffs for a set of merge requests. | ||||
| | * | | | Migrate user private tokens to personal access tokens | Douwe Maan | 2017-11-02 | 1 | -0/+78 |
| | |/ / | |||||
| * | | | Fix rubocop offenses | Alessio Caiazza | 2017-11-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | General cleanup | Alessio Caiazza | 2017-11-02 | 1 | -0/+4 |
| | | | | |||||
| * | | | Improve backend structure of data | Kamil Trzcinski | 2017-11-02 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'refactor-clusters' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-02 | 4 | -0/+197 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Revert back FetchKubernetesTokenService | Kamil Trzcinski | 2017-11-01 | 1 | -2/+2 |
| | | | | |||||
| | * | | Improve migration file. Add migration spec. Reorder columns of the table. | Shinya Maeda | 2017-11-01 | 3 | -96/+100 |
| | | | | |||||
| | * | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 1 | -0/+16 |
| | |\ \ | | |/ | |||||
| | | * | Add new circuitbreaker properties to application_settings | Bob Van Landuyt | 2017-10-23 | 1 | -0/+16 |
| | | | | |||||
| | * | | This works | Shinya Maeda | 2017-10-23 | 2 | -9/+93 |
| | | | | |||||
| | * | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform | Kamil Trzcinski | 2017-10-23 | 1 | -0/+66 |
| | |/ | |||||
| | * | Add existing circuitbreaker settings to the database | Bob Van Landuyt | 2017-10-17 | 1 | -0/+27 |
| | | | |||||
| * | | Install k8s application with helm running inside the cluster | Alessio Caiazza | 2017-11-02 | 1 | -0/+14 |
| |/ | |||||
| * | added date parameter for time trackinggitlab-ee-1312-time-spent-at | Vlad | 2017-10-13 | 1 | -0/+11 |
| | | |||||
| * | Ignore existing Migration/Datetime cop offenders | Sean McGivern | 2017-10-10 | 4 | -0/+4 |
| | | |||||
| * | Add a migration to populate fork networks | Bob Van Landuyt | 2017-10-07 | 1 | -0/+30 |
| | | | | | This uses the existing ForkedProjectLinks | ||||
| * | Allow creating merge requests across forks of a project | Bob Van Landuyt | 2017-10-07 | 1 | -1/+1 |
| | | |||||
| * | Create a fork network when forking a project | Bob Van Landuyt | 2017-10-07 | 1 | -0/+26 |
| | | | | | | When no fork network exists for the source projects, we create a new one with the correct source | ||||
| * | Add a model for `fork_networks` | Bob Van Landuyt | 2017-10-07 | 1 | -0/+28 |
| | | | | | | The fork network will keep track of the root project as long as it's present. | ||||
| * | Merge branch 'master' into '37970-ci-sections-tracking' | Kamil Trzciński | 2017-10-07 | 6 | -0/+159 |
| |\ | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | Merge branch ↵ | Kamil Trzciński | 2017-10-06 | 1 | -0/+45 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470 | ||||
| | | * | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-07 | 2 | -0/+32 |
| | | |\ | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | | * | | Optimise gcp_clusters table schema | Kamil Trzcinski | 2017-10-05 | 1 | -6/+10 |
| | | | | | |||||
| | | * | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-10-05 | 2 | -0/+69 |
| | | |\ \ | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | | * \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-05 | 2 | -2/+29 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | | * \ \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-04 | 1 | -0/+39 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| | | * | | | | | Specify defaults, fix policies, fix db columns | Kamil Trzcinski | 2017-10-04 | 1 | -6/+6 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-04 | 3 | -0/+79 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |