Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'bw-count-service-cache-options' into 'master' | Stan Hu | 2017-11-30 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | allow caching options to be specified for counting services | Brett Walker | 2017-11-30 | 2 | -1/+13 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'improve-require-input-spec' into 'master' | Fatih Acet | 2017-11-30 | 1 | -36/+40 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Improve require input specimprove-require-input-spec | Clement Ho | 2017-11-29 | 1 | -36/+40 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch '40642-members-tab-not-signed-in' into 'master' | Mike Greiling | 2017-11-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add project_members controller when not signed in40642-members-tab-not-signed-in | Annabel Dunstone Gray | 2017-11-29 | 1 | -1/+1 | |
* | | | | | | | | Update CHANGELOG.md for 10.2.3 | Michael Kozono | 2017-11-30 | 11 | -51/+19 | |
* | | | | | | | | Merge branch 'zj-blobs-bulk-gitaly' into 'master' | Robert Speicher | 2017-11-30 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add link to gitaly converation | Zeger-Jan van de Weg | 2017-11-30 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'patch-29' into 'master' | Sean McGivern | 2017-11-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update google.md to reflect changes in the new Google APIs Library | Abubakar Ango | 2017-11-28 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch '40690-rake-dev-setup-is-broken-due-to-the-latest-update-of-seed... | Sean McGivern | 2017-11-30 | 3 | -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-fu | Rémy Coutable | 2017-11-30 | 1 | -0/+15 | |
| * | | | | | | | | | Pin seed-fu to 2.3.6 since 2.3.7 is broken | Rémy Coutable | 2017-11-30 | 2 | -3/+3 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch '13634-broadcast-message' into 'master' | Tim Zallmann | 2017-11-30 | 3 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add changelog entry13634-broadcast-message | Kushal Pandya | 2017-11-28 | 1 | -0/+5 | |
| * | | | | | | | | | Fix broadcast message not showing up on login page | Kushal Pandya | 2017-11-28 | 2 | -1/+6 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'gitaly-test-home' into 'master' | Rémy Coutable | 2017-11-30 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Set an artificial $HOME for gitaly in test | Jacob Vosmaer (GitLab) | 2017-11-30 | 2 | -1/+5 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master' | Grzegorz Bizon | 2017-11-30 | 28 | -241/+589 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix feature spec38668-revert-copied-kubernetesservice-logic | Shinya Maeda | 2017-11-28 | 3 | -4/+9 | |
| * | | | | | | | | Fix integraetion tests | Shinya Maeda | 2017-11-28 | 2 | -2/+1 | |
| * | | | | | | | | Fix static analysys | Shinya Maeda | 2017-11-28 | 4 | -5/+6 | |
| * | | | | | | | | Fix unit tests | Shinya Maeda | 2017-11-28 | 4 | -12/+15 | |
| * | | | | | | | | Aling shared_exmaples to "same behavior between KubernetesService and Platfor... | Shinya Maeda | 2017-11-28 | 13 | -86/+37 | |
| * | | | | | | | | Replce kubernetes_service and deployment_service to deployment_platform | Shinya Maeda | 2017-11-28 | 18 | -183/+130 | |
| * | | | | | | | | Duplicate spec for Platform::Kubernetes with kubernetes_project | Shinya Maeda | 2017-11-28 | 5 | -44/+102 | |
| * | | | | | | | | Add test for checking interchangeability between KubernetesService and Cluste... | Shinya Maeda | 2017-11-28 | 1 | -0/+45 | |
| * | | | | | | | | Add test suit for platform::kubernetes | Shinya Maeda | 2017-11-28 | 8 | -82/+219 | |
| * | | | | | | | | Remove logic which glues with KubernetesService, from Platforms::Kubernetes | Shinya Maeda | 2017-11-28 | 2 | -57/+3 | |
| * | | | | | | | | Fix comments | Shinya Maeda | 2017-11-28 | 1 | -0/+1 | |
| * | | | | | | | | Add deployment platform selector | Shinya Maeda | 2017-11-28 | 1 | -2/+12 | |
| * | | | | | | | | Fix tests for Clusters::Platforms::Kubernetes | Shinya Maeda | 2017-11-28 | 1 | -12/+4 | |
| * | | | | | | | | Check diff between KubernetesService and Platforms::Kubernetes. Synchronize a... | Shinya Maeda | 2017-11-28 | 2 | -67/+62 | |
| * | | | | | | | | Revert KubernetesService logic in Platforms::Kubernetes | Shinya Maeda | 2017-11-28 | 2 | -0/+258 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'multi-file-editor-dirty-diff-indicator' into 'master' | Tim Zallmann | 2017-11-30 | 24 | -41/+1157 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | updated diff spec | Phil Hughes | 2017-11-30 | 1 | -31/+31 | |
| * | | | | | | | | Merge branch 'master' into multi-file-editor-dirty-diff-indicator | Phil Hughes | 2017-11-30 | 218 | -2646/+4858 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | added editor options to redcue EE conflicts | Phil Hughes | 2017-11-29 | 3 | -0/+19 | |
| * | | | | | | | | | fixed failing specs | Phil Hughes | 2017-11-28 | 3 | -10/+19 | |
| * | | | | | | | | | fixed scss-lint | Phil Hughes | 2017-11-28 | 1 | -4/+4 | |
| * | | | | | | | | | added specs | Phil Hughes | 2017-11-28 | 8 | -22/+714 | |
| * | | | | | | | | | fixed web worker performance | Phil Hughes | 2017-11-28 | 5 | -4/+14 | |
| * | | | | | | | | | added web worker to calculate diffs | Phil Hughes | 2017-11-28 | 5 | -47/+79 | |
| * | | | | | | | | | started move to web worker for diff calculation | Phil Hughes | 2017-11-28 | 8 | -87/+90 | |
| * | | | | | | | | | changed endLineNumber calculation | Phil Hughes | 2017-11-28 | 1 | -2/+2 | |
| * | | | | | | | | | change how diffing works | Phil Hughes | 2017-11-28 | 5 | -104/+59 | |
| * | | | | | | | | | added disposable manager | Phil Hughes | 2017-11-28 | 8 | -80/+152 | |
| * | | | | | | | | | created editor library to manage all things editor | Phil Hughes | 2017-11-28 | 8 | -77/+344 | |
| * | | | | | | | | | Multi-file editor dirty diff indicator | Phil Hughes | 2017-11-28 | 2 | -6/+64 |