Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [API] Document how to unassign labels, milestones, and assigneesdocs/api-nil | Achilleas Pipinellis | 2017-12-01 | 2 | -7/+7 |
| | |||||
* | 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 | ||||
| * | | | | We could simply count the commits | Lin Jen-Shin | 2017-11-30 | 3 | -2/+8 |
| | | | | | |||||
* | | | | | Merge branch 'protected-branches-names' into 'master' | Douwe Maan | 2017-11-30 | 3 | -2/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Only load branch names for protected branch checks See merge request gitlab-org/gitlab-ce!15629 | ||||
| * | | | | | Only load branch names for protected branch checksprotected-branches-names | Yorick Peterse | 2017-11-29 | 3 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking if a branch is protected we don't need all columns of every protected branch row, instead we only care about the names. By using "select" here we reduce the amount of data we need to send over the wire and load into memory. | ||||
* | | | | | | Merge branch '39455-clone-dropdown-should-not-have-a-tooltip' into 'master' | Tim Zallmann | 2017-11-30 | 7 | -48/+89 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clone dropdown should not have a tooltip" Closes #39455 See merge request gitlab-org/gitlab-ce!15334 | ||||
| * | | | | | | Added ssh_button helper specs and addressed ruby code observations | Jose Ivan Vargas | 2017-11-27 | 3 | -36/+67 |
| | | | | | | | |||||
| * | | | | | | UX adjustments and spec corrections | Jose Ivan Vargas | 2017-11-27 | 5 | -39/+15 |
| | | | | | | | |||||
| * | | | | | | Change dropdown button background color | Jose Ivan Vargas | 2017-11-27 | 2 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Removed tooltip from clone dropdown | Jose Ivan Vargas | 2017-11-27 | 3 | -26/+56 |
| | | | | | | | |||||
* | | | | | | | Merge branch '40671-fix-empty-blank-flash-messages' into 'master' | Phil Hughes | 2017-11-30 | 2 | -3/+27 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove blank/empty flash messages caused by nil Closes #40671 See merge request gitlab-org/gitlab-ce!15658 | ||||
| * | | | | | | Remove blank flash messages caused by nil40671-fix-empty-blank-flash-messages | Eric Eastwood | 2017-11-29 | 2 | -3/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40671 See https://gitlab.com/gitlab-org/gitlab-ce/blob/f7254a4060b30e3134c6cf932eaba0fc8e249e9a/app/controllers/sessions_controller.rb#L42 for an example of where we set `flash[:notice] = nil` | ||||
* | | | | | | | Merge branch 'es-module-copy-to-clipboard' into 'master' | Tim Zallmann | 2017-11-30 | 7 | -705/+85 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor 'copy-to-clipboard.js' See merge request gitlab-org/gitlab-ce!15531 | ||||
| * | | | | | | | dedupe clipboard dependencyes-module-copy-to-clipboard | Mike Greiling | 2017-11-28 | 1 | -14/+2 |
| | | | | | | | | |||||
| * | | | | | | | clarify safari browser support | Mike Greiling | 2017-11-28 | 1 | -4/+4 |
| | | | | | | | |