summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | Adjustments to polling & formsFilipa Lacerda2017-10-043-86/+66
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix static analysys. Fix import config.Shinya Maeda2017-10-041-1/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix static anlysys. Added safe_model_attributes.Shinya Maeda2017-10-041-1/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into ↵Shinya Maeda2017-10-048-13/+23
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * | | | | | | | | | | | Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix ↵Shinya Maeda2017-10-045-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static analysys.
| | * | | | | | | | | | | | Specify defaults, fix policies, fix db columnsKamil Trzcinski2017-10-046-32/+51
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Gcp::Cluster improvementsKamil Trzcinski2017-10-032-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce state machine - use before transitions to clear data - introduce namespace validation
| | * | | | | | | | | | | | Prefer to use `.tap` as `.try` hides an exceptions from workersKamil Trzcinski2017-10-031-2/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix HAML permission check for ability to update clustersKamil Trzcinski2017-10-031-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Rename to ClusterProvisionWorker and CreateGkeClusterService.new.executeKamil Trzcinski2017-10-033-8/+8
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Introduce policy check for clusters navigation optionKamil Trzcinski2017-10-032-5/+6
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Introduce serializer for ClusterEntityKamil Trzcinski2017-10-033-10/+34
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into ↵Shinya Maeda2017-10-0435-163/+385
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-04278-5322/+1805
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch ↵Shinya Maeda2017-10-044-77/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | | * | | | | | | | | | | | | | Adjust to route changeFilipa Lacerda2017-10-033-76/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust toggle status Add confirmation box Adds permissions checks
| | | * | | | | | | | | | | | | | Adds new line for cssFilipa Lacerda2017-10-031-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Introduce manage_cluster queue for sidekiq workersShinya Maeda2017-10-043-2/+12
| | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Implement Policy. Use show instead of edit. Chnage db column. fix comments. ↵Shinya Maeda2017-10-0312-128/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dry up workers
| | * | | | | | | | | | | | | | Adds toggle buttonFilipa Lacerda2017-10-023-18/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds polling function
| | * | | | | | | | | | | | | | Updates sidebarFilipa Lacerda2017-10-026-23/+18
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch ↵Filipa Lacerda2017-10-029-42/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service * 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce: PollingInterval, rename to gke_clusters, has_one :cluster Use expires_in for access_token validation
| | | * | | | | | | | | | | | | | PollingInterval, rename to gke_clusters, has_one :clusterShinya Maeda2017-10-028-34/+38
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Use expires_in for access_token validationShinya Maeda2017-10-022-8/+18
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Starts edit formFilipa Lacerda2017-10-024-10/+68
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Adds clusters to the navigation barFilipa Lacerda2017-10-024-4/+10
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new line at the end of files
| | * | | | | | | | | | | | | | authorize in controller. validation in model.Shinya Maeda2017-10-017-33/+61
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Revert KubernetesService. Introduce FetchKubernetesTokenService.Shinya Maeda2017-10-018-81/+121
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Replace reactive_cache by multipel sidekiq workersShinya Maeda2017-10-0110-166/+290
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Adds login page, sidebar, header and formFilipa Lacerda2017-09-296-13/+72
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error ↵Shinya Maeda2017-09-294-36/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling. Polish.
| | * | | | | | | | | | | | | | Multithreading cluster creation is done with `reactive_cache`Shinya Maeda2017-09-285-73/+130
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Delete/Update basic implementationShinya Maeda2017-09-272-2/+11
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fetch k8s token from k8s username/passwordShinya Maeda2017-09-274-6/+39
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add login root. Remove ceration type.Shinya Maeda2017-09-277-130/+61
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Remove sensitive literal dataShinya Maeda2017-09-271-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Improve ClustersControllerShinya Maeda2017-09-262-16/+19
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Create clusterShinya Maeda2017-09-265-20/+31
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Tie KubernetesServiceShinya Maeda2017-09-262-11/+30
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | okShinya Maeda2017-09-263-29/+56
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Create Kubernetes cluster on GKE from k8s serviceShinya Maeda2017-09-256-0/+163
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-0639-94/+586
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531
| | * | | | | | | | | | | | | | | UX review18608-lock-issues-v2Luke "Jared" Bennett2017-10-065-2/+11
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix wording in the js messagesJarka Kadlecova2017-10-062-2/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch '18608-lock-issues-v2' of gitlab.com:gitlab-org/gitlab-ce into ↵Luke "Jared" Bennett2017-10-03266-5059/+1499
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Jarka Kadlecova2017-10-03266-5059/+1499
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb
| | * | | | | | | | | | | | | | | | Remove interpolated translation stringsLuke "Jared" Bennett2017-10-032-7/+8
| | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Further review changesLuke "Jared" Bennett2017-10-023-11/+10
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | FE review changes app codeLuke "Jared" Bennett2017-10-018-24/+40
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix md-area top border-radius with issue issuable-note-warningLuke "Jared" Bennett2017-09-291-1/+2
| | | | | | | | | | | | | | | | |