summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1060-209/+493
|\
| * Fix unable to expand text diff discussion commentsClement Ho2017-10-103-4/+4
| * Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-108-8/+8
| |\
| | * Created group_icon and group_icon_urlTim Zallmann2017-10-048-8/+8
| * | Remove Build code from global namespaceFilipa Lacerda2017-10-101-1/+1
| * | fix incorrect description for advanced settings section of project settings38574-superfluous-export-in-advanced-settings-of-project-settingsMike Greiling2017-10-091-1/+1
| * | Merge branch 'wiki-empty-page-heading' into 'master'Filipa Lacerda2017-10-091-1/+1
| |\ \
| | * | Fix wiki empty page translation namespace not being removedwiki-empty-page-headingPhil Hughes2017-10-091-1/+1
| * | | Merge branch '37483-activity-log-show-wrong-number-of-commits-per-push' into ...Rémy Coutable2017-10-091-2/+1
| |\ \ \
| | * | | Fix the number representing the amount of commits related to a push eventMark Fletcher2017-10-061-2/+1
| * | | | Merge branch 'icons-update-fix-regression-on-groups' into 'master'Phil Hughes2017-10-091-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Updated Icons + Fix for Collapsed Groups Angleicons-update-fix-regression-on-groupsTim Zallmann2017-10-091-1/+1
| * | | | Move cycle analytics banner into a vue fileFilipa Lacerda2017-10-091-12/+3
| |/ / /
| * | | Merge branch 'cleanup_old_nav_stuff' into 'master'Filipa Lacerda2017-10-072-4/+4
| |\ \ \
| | * | | Finish combining nav stylesAnnabel Dunstone Gray2017-10-061-2/+2
| | * | | Start moving new nav styles into header.scssAnnabel Dunstone Gray2017-10-061-1/+1
| | * | | Remove nav images; remove old nav styles; create new file for other navigatio...Annabel Dunstone Gray2017-10-061-1/+1
| * | | | Show fork information on the project panelBob Van Landuyt2017-10-071-4/+10
| * | | | Commenting on image diffsFelipe Artur2017-10-079-100/+168
| * | | | 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