summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Include GitLab full name with username in Slack messagessh-show-all-slack-namesStan Hu2017-10-067-16/+26
* Merge branch 'ide-fix-back-btn' into 'master'Fatih Acet2017-10-066-19/+62
|\
| * Good old dangling commaide-fix-back-btnTim Zallmann2017-10-061-1/+1
| * Resetting of active Line + setting it for the async display functionsTim Zallmann2017-10-063-13/+22
| * Fixed Linting Error + Error with Line Highlighter found in TestTim Zallmann2017-10-052-3/+3
| * CHanged to Helper MethodTim Zallmann2017-10-051-1/+1
| * Removed the console.logTim Zallmann2017-10-051-1/+0
| * Refactored Highlighting mechanismTim Zallmann2017-10-054-16/+18
| * Optimising IfTim Zallmann2017-10-041-2/+2
| * Added Check for Line Number ElementTim Zallmann2017-10-041-1/+1
| * Fixed Repo Sidebar TestsTim Zallmann2017-10-041-29/+30
| * Fixed Eslint ErrorsTim Zallmann2017-10-041-4/+4
| * Polished Back Button for files that are not in the tree anymoreTim Zallmann2017-10-041-1/+10
| * Fixed Back Button for files + line number jumping for preview and editorTim Zallmann2017-10-044-7/+30
* | 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-064-6/+17
|\ \ \
| * | | Add 1000+ counters (instead of inifnite) to jobs controlleradd-1000-plus-counters-for-jobs-pageKamil Trzcinski2017-10-063-5/+16
| * | | 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-0631-1/+870
|\ \ \ \
| * \ \ \ 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-0718-19/+154
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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-0618-44/+204
| |\ \ \ \ \ \
| * | | | | | | Security fix: redirection in google_api/authorizations_controllerShinya Maeda2017-10-062-5/+14
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Filipa Lacerda2017-10-061-1/+1
| |\ \ \ \ \ \
| | * | | | | | Use utc for time comparisionShinya Maeda2017-10-061-1/+1
| * | | | | | | Fix margins in edit formFilipa Lacerda2017-10-062-11/+14
| |/ / / / / /
| * | | | | | Fix almost all unresolved comments from Docs and UX reviewKamil Trzcinski2017-10-059-18/+29
| * | | | | | Add ClusterPresenter. Fix Static Analysys.Shinya Maeda2017-10-064-2/+12
| * | | | | | 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-053-4/+4
| |\ \ \ \ \ \
| | * | | | | | spec/features/projects/clusters_spec. Fix static analysysShinya Maeda2017-10-052-2/+2
| | * | | | | | authorizations_controller_spec. cluster_policy_spec.Shinya Maeda2017-10-051-2/+2
| * | | | | | | Added cluster controller specsKamil Trzcinski2017-10-051-1/+1
| * | | | | | | Cluster can be read only by masterKamil Trzcinski2017-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-0539-158/+263
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | fetch_kubernetes_token_service_spec. Fix static analysys.Shinya Maeda2017-10-051-0/+2
| * | | | | | | integrate_cluster_service_spec. provision_cluster_service_spec. update_cluste...Shinya Maeda2017-10-052-2/+2
| * | | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0568-478/+1033
| |\ \ \ \ \ \ \
| * | | | | | | | Changes after reviewFilipa Lacerda2017-10-046-34/+38
| * | | | | | | | Remove status enum from Gcp::Cluster, use state_machine#stateKamil Trzcinski2017-10-044-11/+8
| * | | | | | | | Fix Rubocop failuresKamil Trzcinski2017-10-041-6/+6
| * | | | | | | | Updated messages and noticesKamil Trzcinski2017-10-042-7/+3
| * | | | | | | | Adds Frontend specsFilipa Lacerda2017-10-042-11/+4
| * | | | | | | | Add spec/models/gcp/cluster_spec.rbShinya Maeda2017-10-041-1/+1