summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-6/+14
* Merge branch '38775-scrollable-tabs-on-admin' into 'master'Filipa Lacerda2017-10-062-2/+2
|\
| * Make tabs on top scrollable on admin dashboardTakuya Noguchi2017-10-052-2/+2
* | Merge branch 'add-1000-plus-counters-for-jobs-page' into 'master'Yorick Peterse2017-10-062-5/+5
|\ \
| * | Add 1000+ counters (instead of inifnite) to jobs controlleradd-1000-plus-counters-for-jobs-pageKamil Trzcinski2017-10-062-5/+5
* | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil TrzciƄski2017-10-067-1/+160
|\ \ \
| * \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-073-2/+9
| |\ \ \
| * \ \ \ Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Shinya Maeda2017-10-061-1/+1
| |\ \ \ \
| | * | | | Fix sidebar titleFilipa Lacerda2017-10-061-2/+2
| * | | | | Change Clusters to Cluster in sidebarShinya Maeda2017-10-061-2/+2
| * | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-061-4/+11
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix margins in edit formFilipa Lacerda2017-10-061-11/+10
| * | | | | Fix almost all unresolved comments from Docs and UX reviewKamil Trzcinski2017-10-056-13/+22
| * | | | | Add ClusterPresenter. Fix Static Analysys.Shinya Maeda2017-10-061-1/+1
| * | | | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzcinski2017-10-052-2/+2
| |\ \ \ \ \
| | * | | | | spec/features/projects/clusters_spec. Fix static analysysShinya Maeda2017-10-052-2/+2
| * | | | | | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-0513-52/+64
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-059-141/+83
| |\ \ \ \ \ \
| * | | | | | | Changes after reviewFilipa Lacerda2017-10-045-31/+34
| * | | | | | | Remove status enum from Gcp::Cluster, use state_machine#stateKamil Trzcinski2017-10-041-1/+1
| * | | | | | | Adds Frontend specsFilipa Lacerda2017-10-041-1/+1
| * | | | | | | Adjustments to polling & formsFilipa Lacerda2017-10-042-42/+38
| * | | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-041-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Specify defaults, fix policies, fix db columnsKamil Trzcinski2017-10-042-9/+12
| * | | | | | | | Fix HAML permission check for ability to update clustersKamil Trzcinski2017-10-031-1/+1
| * | | | | | | | Introduce policy check for clusters navigation optionKamil Trzcinski2017-10-031-5/+5
| * | | | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-048-34/+67
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-04134-569/+138
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adjust to route changeFilipa Lacerda2017-10-031-50/+39
| * | | | | | | | | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. d...Shinya Maeda2017-10-032-11/+11
| * | | | | | | | | | Adds toggle buttonFilipa Lacerda2017-10-021-18/+27
| * | | | | | | | | | Updates sidebarFilipa Lacerda2017-10-025-12/+18
| * | | | | | | | | | Starts edit formFilipa Lacerda2017-10-022-10/+52
| * | | | | | | | | | Adds clusters to the navigation barFilipa Lacerda2017-10-024-4/+10
| * | | | | | | | | | authorize in controller. validation in model.Shinya Maeda2017-10-012-6/+14
| * | | | | | | | | | Revert KubernetesService. Introduce FetchKubernetesTokenService.Shinya Maeda2017-10-011-1/+1
| * | | | | | | | | | Replace reactive_cache by multipel sidekiq workersShinya Maeda2017-10-012-6/+15
| * | | | | | | | | | Adds login page, sidebar, header and formFilipa Lacerda2017-09-295-13/+72
| * | | | | | | | | | Multithreading cluster creation is done with `reactive_cache`Shinya Maeda2017-09-282-1/+2
| * | | | | | | | | | Delete/Update basic implementationShinya Maeda2017-09-271-0/+3
| * | | | | | | | | | Fetch k8s token from k8s username/passwordShinya Maeda2017-09-272-1/+3
| * | | | | | | | | | Add login root. Remove ceration type.Shinya Maeda2017-09-275-18/+12
| * | | | | | | | | | Remove sensitive literal dataShinya Maeda2017-09-271-1/+1
| * | | | | | | | | | Improve ClustersControllerShinya Maeda2017-09-261-1/+1
| * | | | | | | | | | Create clusterShinya Maeda2017-09-264-16/+18
| * | | | | | | | | | okShinya Maeda2017-09-261-3/+3
| * | | | | | | | | | Create Kubernetes cluster on GKE from k8s serviceShinya Maeda2017-09-252-0/+19
* | | | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-066-3/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | UX review18608-lock-issues-v2Luke "Jared" Bennett2017-10-061-1/+1
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-03130-536/+118
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |