summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed IDE monaco instance height & alignmentide-monaco-size-fixPhil Hughes2017-11-303-2/+8
* Merge branch '40690-rake-dev-setup-is-broken-due-to-the-latest-update-of-seed...Sean McGivern2017-11-303-3/+18
|\
| * Add a fixture file that uses seed-fu in the test env so that a borken seed-fu...40690-rake-dev-setup-is-broken-due-to-the-latest-update-of-seed-fuRémy Coutable2017-11-301-0/+15
| * Pin seed-fu to 2.3.6 since 2.3.7 is brokenRémy Coutable2017-11-302-3/+3
* | Merge branch '13634-broadcast-message' into 'master'Tim Zallmann2017-11-303-1/+11
|\ \
| * | Add changelog entry13634-broadcast-messageKushal Pandya2017-11-281-0/+5
| * | Fix broadcast message not showing up on login pageKushal Pandya2017-11-282-1/+6
* | | Merge branch 'gitaly-test-home' into 'master'Rémy Coutable2017-11-302-1/+5
|\ \ \ | |_|/ |/| |
| * | Set an artificial $HOME for gitaly in testJacob Vosmaer (GitLab)2017-11-302-1/+5
|/ /
* | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master'Grzegorz Bizon2017-11-3028-241/+589
|\ \
| * | Fix feature spec38668-revert-copied-kubernetesservice-logicShinya Maeda2017-11-283-4/+9
| * | Fix integraetion testsShinya Maeda2017-11-282-2/+1
| * | Fix static analysysShinya Maeda2017-11-284-5/+6
| * | Fix unit testsShinya Maeda2017-11-284-12/+15
| * | Aling shared_exmaples to "same behavior between KubernetesService and Platfor...Shinya Maeda2017-11-2813-86/+37
| * | Replce kubernetes_service and deployment_service to deployment_platformShinya Maeda2017-11-2818-183/+130
| * | Duplicate spec for Platform::Kubernetes with kubernetes_projectShinya Maeda2017-11-285-44/+102
| * | Add test for checking interchangeability between KubernetesService and Cluste...Shinya Maeda2017-11-281-0/+45
| * | Add test suit for platform::kubernetesShinya Maeda2017-11-288-82/+219
| * | Remove logic which glues with KubernetesService, from Platforms::KubernetesShinya Maeda2017-11-282-57/+3
| * | Fix commentsShinya Maeda2017-11-281-0/+1
| * | Add deployment platform selectorShinya Maeda2017-11-281-2/+12
| * | Fix tests for Clusters::Platforms::KubernetesShinya Maeda2017-11-281-12/+4
| * | Check diff between KubernetesService and Platforms::Kubernetes. Synchronize a...Shinya Maeda2017-11-282-67/+62
| * | Revert KubernetesService logic in Platforms::KubernetesShinya Maeda2017-11-282-0/+258
| |/
* | Merge branch 'multi-file-editor-dirty-diff-indicator' into 'master'Tim Zallmann2017-11-3024-41/+1157
|\ \
| * | updated diff specPhil Hughes2017-11-301-31/+31
| * | Merge branch 'master' into multi-file-editor-dirty-diff-indicatorPhil Hughes2017-11-30218-2646/+4858
| |\ \
| * | | added editor options to redcue EE conflictsPhil Hughes2017-11-293-0/+19
| * | | fixed failing specsPhil Hughes2017-11-283-10/+19
| * | | fixed scss-lintPhil Hughes2017-11-281-4/+4
| * | | added specsPhil Hughes2017-11-288-22/+714
| * | | fixed web worker performancePhil Hughes2017-11-285-4/+14
| * | | added web worker to calculate diffsPhil Hughes2017-11-285-47/+79
| * | | started move to web worker for diff calculationPhil Hughes2017-11-288-87/+90
| * | | changed endLineNumber calculationPhil Hughes2017-11-281-2/+2
| * | | change how diffing worksPhil Hughes2017-11-285-104/+59
| * | | added disposable managerPhil Hughes2017-11-288-80/+152
| * | | created editor library to manage all things editorPhil Hughes2017-11-288-77/+344
| * | | Multi-file editor dirty diff indicatorPhil Hughes2017-11-282-6/+64
* | | | Merge branch 'patch-1' into 'master'Rémy Coutable2017-11-301-0/+3
|\ \ \ \
| * | | | Update installation.md with receive.advertisePushOptionsJonathon Reinhart2017-09-221-0/+3
* | | | | Merge branch '40146_fix_special_charecter_search_in_filenames' into 'master'Rémy Coutable2017-11-303-2/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix for special charecter in file nameshaseeb2017-11-303-2/+19
|/ / / /
* | | | Merge branch 'use-count_commits-directly' into 'master'Douwe Maan2017-11-303-2/+8
|\ \ \ \
| * | | | We could simply count the commitsLin Jen-Shin2017-11-303-2/+8
* | | | | Merge branch 'protected-branches-names' into 'master'Douwe Maan2017-11-303-2/+11
|\ \ \ \ \
| * | | | | Only load branch names for protected branch checksprotected-branches-namesYorick Peterse2017-11-293-2/+11
* | | | | | Merge branch '39455-clone-dropdown-should-not-have-a-tooltip' into 'master'Tim Zallmann2017-11-307-48/+89
|\ \ \ \ \ \
| * | | | | | Added ssh_button helper specs and addressed ruby code observationsJose Ivan Vargas2017-11-273-36/+67
View Lorry Controller Status