Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | Merge branch 'zj-blobs-bulk-gitaly' into 'master' | Robert Speicher | 2017-11-30 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to Gitaly conversion [ci skip] See merge request gitlab-org/gitlab-ce!15666 | |||||
| * | | | | | | | Add link to gitaly converation | Zeger-Jan van de Weg | 2017-11-30 | 1 | -0/+1 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This endpoint still has to be migrated, and this comment makes sure everyone knows we are aware of this one. [ci skip] | |||||
* | | | | | | | 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 See merge request gitlab-org/gitlab-ce!15633 | |||||
| * | | | | | | | Update google.md to reflect changes in the new Google APIs Library | Abubakar Ango | 2017-11-28 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch ↵ | Sean McGivern | 2017-11-30 | 3 | -3/+18 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40690-rake-dev-setup-is-broken-due-to-the-latest-update-of-seed-fu' into 'master' Pin seed-fu to 2.3.6 since 2.3.7 is broken and add a fixture file that uses seed-fu in the test env Closes #40690 See merge request gitlab-org/gitlab-ce!15661 | |||||
| * | | | | | | | | Add a fixture file that uses seed-fu in the test env so that a borken ↵40690-rake-dev-setup-is-broken-due-to-the-latest-update-of-seed-fu | Rémy Coutable | 2017-11-30 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seed-fu is detected Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | | Pin seed-fu to 2.3.6 since 2.3.7 is broken | Rémy Coutable | 2017-11-30 | 2 | -3/+3 | |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/40690 and https://github.com/mbleigh/seed-fu/issues/123 for details. Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | | | | | | | | Merge branch '13634-broadcast-message' into 'master' | Tim Zallmann | 2017-11-30 | 3 | -1/+11 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broadcast message not showing up on login page Closes #13634 See merge request gitlab-org/gitlab-ce!15578 | |||||
| * | | | | | | | | 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 See merge request gitlab-org/gitlab-ce!15614 | |||||
| * | | | | | | | 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 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector. See merge request gitlab-org/gitlab-ce!15515 | |||||
| * | | | | | | | 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 ↵ | Shinya Maeda | 2017-11-28 | 13 | -86/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform::Kubernetes" | |||||
| * | | | | | | | 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 ↵ | Shinya Maeda | 2017-11-28 | 1 | -0/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clusters::Platform::Kubernetes | |||||
| * | | | | | | | 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 ↵ | Shinya Maeda | 2017-11-28 | 2 | -67/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | again. | |||||
| * | | | | | | | 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 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-file editor dirty diff indicator Closes #40046 See merge request gitlab-org/gitlab-ce!15423 | |||||
| * | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | added web worker to calculate diffs | Phil Hughes | 2017-11-28 | 5 | -47/+79 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | change how diffing works | Phil Hughes | 2017-11-28 | 5 | -104/+59 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | added disposable manager | Phil Hughes | 2017-11-28 | 8 | -80/+152 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added model manager [ci skip] | |||||
| * | | | | | | | | created editor library to manage all things editor | Phil Hughes | 2017-11-28 | 8 | -77/+344 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | Multi-file editor dirty diff indicator | Phil Hughes | 2017-11-28 | 2 | -6/+64 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | | Merge branch 'patch-1' into 'master' | Rémy Coutable | 2017-11-30 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation.md with receive.advertisePushOptions See merge request gitlab-org/gitlab-ce!14430 | |||||
| * | | | | | | | | | Update installation.md with receive.advertisePushOptions | Jonathon Reinhart | 2017-09-22 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/33061#note_37473342 | |||||
* | | | | | | | | | | Merge branch '40146_fix_special_charecter_search_in_filenames' into 'master' | Rémy Coutable | 2017-11-30 | 3 | -2/+19 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for special charecter in file names Closes #40146 See merge request gitlab-org/gitlab-ce!15606 | |||||
| * | | | | | | | | | fix for special charecter in file names | haseeb | 2017-11-30 | 3 | -2/+19 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'use-count_commits-directly' into 'master' | Douwe Maan | 2017-11-30 | 3 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Count the commits directly See merge request gitlab-org/gitlab-ce!15628 |