summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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 test See merge request gitlab-org/gitlab-ce!15614
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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 ↵Shinya Maeda2017-11-2813-86/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform::Kubernetes"
| * | | | | | | 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 ↵Shinya Maeda2017-11-281-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clusters::Platform::Kubernetes
| * | | | | | | 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 ↵Shinya Maeda2017-11-282-67/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | again.
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-file editor dirty diff indicator Closes #40046 See merge request gitlab-org/gitlab-ce!15423
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | added web worker to calculate diffsPhil Hughes2017-11-285-47/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | started move to web worker for diff calculationPhil Hughes2017-11-288-87/+90
| | | | | | | | |
| * | | | | | | | changed endLineNumber calculationPhil Hughes2017-11-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | change how diffing worksPhil Hughes2017-11-285-104/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | added disposable managerPhil Hughes2017-11-288-80/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added model manager [ci skip]
| * | | | | | | | created editor library to manage all things editorPhil Hughes2017-11-288-77/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Multi-file editor dirty diff indicatorPhil Hughes2017-11-282-6/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'patch-1' into 'master'Rémy Coutable2017-11-301-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation.md with receive.advertisePushOptions See merge request gitlab-org/gitlab-ce!14430
| * | | | | | | | | Update installation.md with receive.advertisePushOptionsJonathon Reinhart2017-09-221-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 Coutable2017-11-303-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 nameshaseeb2017-11-303-2/+19
|/ / / / / / / / /
* | | | | | | | | Merge branch 'use-count_commits-directly' into 'master'Douwe Maan2017-11-303-2/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Count the commits directly See merge request gitlab-org/gitlab-ce!15628
| * | | | | | | | | 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 checks See merge request gitlab-org/gitlab-ce!15629
| * | | | | | | | | | Only load branch names for protected branch checksprotected-branches-namesYorick Peterse2017-11-293-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 Zallmann2017-11-307-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 observationsJose Ivan Vargas2017-11-273-36/+67
| | | | | | | | | | | |
| * | | | | | | | | | | UX adjustments and spec correctionsJose Ivan Vargas2017-11-275-39/+15
| | | | | | | | | | | |
| * | | | | | | | | | | Change dropdown button background colorJose Ivan Vargas2017-11-272-1/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Removed tooltip from clone dropdownJose Ivan Vargas2017-11-273-26/+56
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '40671-fix-empty-blank-flash-messages' into 'master'Phil Hughes2017-11-302-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-messagesEric Eastwood2017-11-292-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 Zallmann2017-11-307-705/+85
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor 'copy-to-clipboard.js' See merge request gitlab-org/gitlab-ce!15531