summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1021-60/+344
|\
| * Merge branch 'master' into 'group-sort-dropdown-blank'Robert Speicher2017-10-0914-31/+269
| |\
| | * Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-075-17/+56
| | |\
| | | * Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-065-17/+56
| | * | Find branches in all projects in the fork networkBob Van Landuyt2017-10-071-2/+5
| | * | Commenting on image diffsFelipe Artur2017-10-071-3/+8
| | * | Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-7/+22
| | |/
| | * Merge branch 'add-1000-plus-counters-for-jobs-page' into 'master'Yorick Peterse2017-10-061-1/+1
| | |\
| | | * Sort by id, not created_atjobs-sort-by-idKamil Trzcinski2017-09-261-1/+1
| | * | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-062-0/+165
| | |\ \
| | | * \ Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serviceShinya Maeda2017-10-072-12/+21
| | | |\ \
| | | | * | Improve redirect uri state and fix all remaining testsKamil Trzcinski2017-10-062-12/+21
| | | * | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-071-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-063-14/+38
| | | |\ \ \
| | | * | | | Security fix: redirection in google_api/authorizations_controllerShinya Maeda2017-10-062-5/+14
| | | * | | | Fix almost all unresolved comments from Docs and UX reviewKamil Trzcinski2017-10-051-2/+2
| | | * | | | Add ClusterPresenter. Fix Static Analysys.Shinya Maeda2017-10-061-1/+1
| | | * | | | Change `/google_api/authorizations/` to `/google_api/auth/`.Kamil Trzcinski2017-10-052-2/+2
| | | * | | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzcinski2017-10-051-2/+2
| | | |\ \ \ \
| | | | * | | | authorizations_controller_spec. cluster_policy_spec.Shinya Maeda2017-10-051-2/+2
| | | * | | | | Split create_params and update_params and fix small redirect bug in controllerKamil Trzcinski2017-10-051-13/+20
| | | * | | | | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-055-15/+37
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-054-14/+38
| | | |\ \ \ \ \
| | | * | | | | | Fix Rubocop failuresKamil Trzcinski2017-10-041-6/+6
| | | * | | | | | Updated messages and noticesKamil Trzcinski2017-10-041-3/+3
| | | * | | | | | Add warning messagesFilipa Lacerda2017-10-041-7/+6
| | | * | | | | | Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix stat...Shinya Maeda2017-10-041-3/+2
| | | * | | | | | Introduce serializer for ClusterEntityKamil Trzcinski2017-10-031-10/+21
| | | * | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-044-20/+9
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0419-37/+102
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. d...Shinya Maeda2017-10-031-9/+19
| | | * | | | | | | | PollingInterval, rename to gke_clusters, has_one :clusterShinya Maeda2017-10-021-4/+6
| | | * | | | | | | | Use expires_in for access_token validationShinya Maeda2017-10-022-8/+18
| | | * | | | | | | | authorize in controller. validation in model.Shinya Maeda2017-10-011-13/+2
| | | * | | | | | | | Replace reactive_cache by multipel sidekiq workersShinya Maeda2017-10-012-45/+45
| | | * | | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error h...Shinya Maeda2017-09-292-11/+31
| | | * | | | | | | | Multithreading cluster creation is done with `reactive_cache`Shinya Maeda2017-09-281-72/+21
| | | * | | | | | | | Delete/Update basic implementationShinya Maeda2017-09-271-2/+8
| | | * | | | | | | | Fetch k8s token from k8s username/passwordShinya Maeda2017-09-271-3/+20
| | | * | | | | | | | Add login root. Remove ceration type.Shinya Maeda2017-09-271-107/+49
| | | * | | | | | | | Improve ClustersControllerShinya Maeda2017-09-261-15/+18
| | | * | | | | | | | Create clusterShinya Maeda2017-09-261-4/+13
| | | * | | | | | | | Tie KubernetesServiceShinya Maeda2017-09-261-11/+29
| | | * | | | | | | | okShinya Maeda2017-09-262-26/+53
| | | * | | | | | | | Create Kubernetes cluster on GKE from k8s serviceShinya Maeda2017-09-252-0/+129
| | * | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-063-0/+11
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-0319-30/+82
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-253-10/+32
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-2013-35/+65
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-186-49/+15
| | | |\ \ \ \ \ \ \ \ \
View Lorry Controller Status