summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* added feature specPhil Hughes2017-10-231-1/+0
* fixed bug with tabs not switching correctlyPhil Hughes2017-10-231-0/+1
* Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-0/+2
|\
| * Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-0/+2
* | Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-171-0/+1
|\ \
| * \ Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-171-0/+1
| |\ \
| | * | Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-171-1/+1
| | * | Refactored multi-file data structurePhil Hughes2017-10-161-0/+1
* | | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-171-10/+0
|/ / /
* | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
* | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-1/+1
|/ /
* | Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-111-11/+2
* | Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-072-1/+19
|\ \
| * | Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-062-1/+19
* | | Find branches in all projects in the fork networkBob Van Landuyt2017-10-071-2/+5
|/ /
* | 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-061-0/+136
|\ \ \
| * | | Improve redirect uri state and fix all remaining testsKamil Trzcinski2017-10-061-6/+10
| * | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-061-7/+11
| |\ \ \
| * | | | Security fix: redirection in google_api/authorizations_controllerShinya Maeda2017-10-061-3/+7
| * | | | 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-051-1/+1
| * | | | 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-051-0/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-053-13/+37
| |\ \ \ \ \
| * | | | | | 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-042-19/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-042-0/+4
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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-021-5/+11
| * | | | | | | authorize in controller. validation in model.Shinya Maeda2017-10-011-13/+2
| * | | | | | | Replace reactive_cache by multipel sidekiq workersShinya Maeda2017-10-011-42/+42
| * | | | | | | Databse foreing key, index, encrypt password. Use short path. Improve error h...Shinya Maeda2017-09-291-9/+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-261-11/+48
| * | | | | | | Create Kubernetes cluster on GKE from k8s serviceShinya Maeda2017-09-251-0/+102
* | | | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-063-0/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |