Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix Vuex module structre for diffs and notesvuex_note_modules | Simon Knox | 2018-03-26 | 8 | -63/+83 |
| | | | | match directory structure described in Vuex docs | ||||
* | Review fixes. | Fatih Acet | 2018-03-24 | 7 | -32/+52 |
| | |||||
* | Merge branch 'changes_tab_vue_refactoring' of ↵ | Simon Knox | 2018-03-23 | 17 | -28/+301 |
|\ | | | | | | | gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring | ||||
| * | Implement fetching more context lines. | Fatih Acet | 2018-03-23 | 17 | -56/+350 |
| | | |||||
* | | remove vue_mr_discussions cookie checks | Simon Knox | 2018-03-23 | 6 | -126/+153 |
| | | |||||
* | | fix duplicate #notes element | Simon Knox | 2018-03-23 | 1 | -1/+2 |
| | | |||||
* | | fix View File link for replaced images | Simon Knox | 2018-03-23 | 2 | -23/+31 |
| | | |||||
* | | Merge branch 'changes_tab_vue_refactoring' of ↵ | Simon Knox | 2018-03-23 | 1 | -2/+0 |
|\ \ | |/ | | | | | gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue_refactoring | ||||
| * | copy to clipboard button for sticky file path | Simon Knox | 2018-03-21 | 1 | -2/+19 |
| | | |||||
| * | MR Diffs refactoring. | Fatih Acet | 2018-03-21 | 43 | -38/+1775 |
| | | |||||
| * | Merge branch '_mr-refactor-part-9' into '_mr-refector-review-target' | Tim Zallmann | 2018-03-21 | 1 | -0/+28 |
| |\ | | | | | | | | | | | | | MR Diffs Refactor Part 09: Diffs app. See merge request gitlab-org/gitlab-ce!17853 | ||||
| | * | MR Diffs Refactor Part 09: Diffs app. | Fatih Acet | 2018-03-21 | 1 | -0/+28 |
| | | | |||||
| * | | Merge branch '_mr-refactor-part-5' into '_mr-refector-review-target' | Tim Zallmann | 2018-03-21 | 4 | -11/+45 |
| |\ \ | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 05: New getters for notes store. See merge request gitlab-org/gitlab-ce!17849 | ||||
| | * | | MR Diffs Refactor Part 05: New getters for notes store._mr-refactor-part-5 | Fatih Acet | 2018-03-19 | 4 | -11/+45 |
| | |/ | |||||
| * | | Merge branch '_mr-refactor-part-2' into '_mr-refector-review-target' | Tim Zallmann | 2018-03-21 | 6 | -12/+100 |
| |\ \ | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 02: Minor changes for refactor. See merge request gitlab-org/gitlab-ce!17846 | ||||
| | * | | MR Diffs Refactor Part 02: Minor changes for refactor._mr-refactor-part-2 | Fatih Acet | 2018-03-19 | 6 | -12/+100 |
| | |/ | |||||
| * | | Merge branch '_mr-refactor-part-6' into '_mr-refector-review-target' | Tim Zallmann | 2018-03-21 | 2 | -2/+36 |
| |\ \ | | | | | | | | | | | | | | | | | MR Diffs Refactor Part 06: Notes styling for refactored version. See merge request gitlab-org/gitlab-ce!17850 | ||||
| | * | | MR Diffs Refactor Part 06: Notes styling for refactored version._mr-refactor-part-6 | Fatih Acet | 2018-03-19 | 2 | -2/+36 |
| | |/ | |||||
* | | | add Edit, View and Toggle Note buttons to diff file header | Simon Knox | 2018-03-23 | 3 | -2/+71 |
| | | | |||||
* | | | copy to clipboard button for sticky file path | Simon Knox | 2018-03-21 | 1 | -2/+19 |
| | | | |||||
* | | | MR Diffs refactoring. | Fatih Acet | 2018-03-21 | 54 | -63/+1984 |
|/ / | |||||
* | | Merge branch '_mr-refactor-part-4' into '_mr-refector-review-target' | Tim Zallmann | 2018-03-19 | 6 | -10/+20 |
|\ \ | | | | | | | | | | | | | MR Diffs Refactor Part 04: Minor refactor on old code. See merge request gitlab-org/gitlab-ce!17848 | ||||
| * | | MR Diffs Refactor Part 04: Minor refactor on old code._mr-refactor-part-4 | Fatih Acet | 2018-03-19 | 6 | -10/+20 |
| |/ | |||||
* | | Merge branch '_mr-refactor-part-3' into '_mr-refector-review-target' | Tim Zallmann | 2018-03-19 | 6 | -83/+62 |
|\ \ | |/ |/| | | | | | MR Diffs Refactor Part 03: Remove legacy stuff and prettify. See merge request gitlab-org/gitlab-ce!17847 | ||||
| * | MR Diffs Refactor Part 03: Remove legacy stuff and prettify._mr-refactor-part-3 | Fatih Acet | 2018-03-19 | 6 | -83/+62 |
|/ | |||||
* | Merge branch 'le-issue-boards-height-calculation' into 'master' | Phil Hughes | 2018-03-19 | 4 | -61/+80 |
|\ | | | | | | | | | Make issue boards height calculation clearer and remove magic numbers See merge request gitlab-org/gitlab-ce!17791 | ||||
| * | Make issue boards height calculation clearer and remove magic numbers | Lukas Eipert | 2018-03-19 | 4 | -61/+80 |
|/ | |||||
* | Merge branch 'tc-package-qa-rename-docs' into 'master' | Grzegorz Bizon | 2018-03-19 | 3 | -3/+3 |
|\ | | | | | | | | | Rename `package-qa` in docs See merge request gitlab-org/gitlab-ce!17842 | ||||
| * | Rename `package-qa` in docs | Toon Claes | 2018-03-19 | 3 | -3/+3 |
|/ | | | | | | In gitlab-org/gitlab-ce!17807 the `package-qa` job was renamed to `package-and-qa`. But it was not renamed in the docs. So this change fixes that. | ||||
* | Merge branch 'update-gitlab-ci-yml-services-docs' into 'master' | Achilleas Pipinellis | 2018-03-19 | 2 | -1/+67 |
|\ | | | | | | | | | | | | | Update CI services documnetation Closes gitlab-runner#3095 See merge request gitlab-org/gitlab-ce!17749 | ||||
| * | Copyedit CI services docs | Achilleas Pipinellis | 2018-03-19 | 1 | -56/+33 |
| | | |||||
| * | Add CHANGELOG entryupdate-gitlab-ci-yml-services-docs | Tomasz Maczukin | 2018-03-14 | 1 | -0/+5 |
| | | |||||
| * | Update CI services documnetation | Tomasz Maczukin | 2018-03-14 | 1 | -0/+84 |
| | | |||||
* | | Merge branch 'update-kubeclient' into 'master' | Grzegorz Bizon | 2018-03-19 | 12 | -22/+23 |
|\ \ | | | | | | | | | | | | | | | | | | | Update kubeclient 2.2.0 -> 3.0 Closes #43911 See merge request gitlab-org/gitlab-ce!17739 | ||||
| * \ | Merge branch 'master' into 'update-kubeclient' | Grzegorz Bizon | 2018-03-17 | 233 | -3409/+5755 |
| |\ \ | | | | | | | | | | | | | Conflicts: Gemfile.lock | ||||
| * | | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0) | Pirate Praveen | 2018-03-15 | 10 | -10/+10 |
| | | | | |||||
| * | | | Update kubeclient 2.2.0 -> 3.0 | Pirate Praveen | 2018-03-14 | 2 | -12/+12 |
| | | | | |||||
* | | | | Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' ↵ | Mike Greiling | 2018-03-19 | 5 | -32/+43 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Move UnresolvedDiscussions vue component See merge request gitlab-org/gitlab-ce!17538 | ||||
| * | | | | Move UnresolvedDiscussions vue component | George Tsiolis | 2018-03-08 | 5 | -32/+43 |
| | | | | | |||||
* | | | | | Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master' | Kamil Trzciński | 2018-03-18 | 6 | -7/+55 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify ambiguous with_artifacts implication Closes #44138 See merge request gitlab-org/gitlab-ce!17720 | ||||
| * | | | | | Fix specfix/sm/clarify-ambiguous-with_artifacts-implication | Shinya Maeda | 2018-03-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Use with_artifacts_archive name. Add spec | Shinya Maeda | 2018-03-15 | 4 | -6/+42 |
| | | | | | | |||||
| * | | | | | Fix corrupted test | Shinya Maeda | 2018-03-15 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add feartue spec. Fix failed test | Shinya Maeda | 2018-03-15 | 2 | -1/+13 |
| | | | | | | |||||
| * | | | | | Add rubocop:disable GitlabSecurity/PublicSend | Shinya Maeda | 2018-03-15 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Clarify ambiguous with_artifacts implication | Shinya Maeda | 2018-03-15 | 3 | -6/+6 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix-dropzone-project-show' into 'master' | Jacob Schatz | 2018-03-18 | 3 | -4/+44 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dropzone project show Closes #44137 See merge request gitlab-org/gitlab-ce!17784 | ||||
| * | | | | | Fix dropzone project show | Clement Ho | 2018-03-18 | 3 | -4/+44 |
|/ / / / / | |||||
* | | | | | Merge branch 'sh-fix-module-reloading' into 'master' | Robert Speicher | 2018-03-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "A copy of Gitlab::Metrics::Methods" have been removed error Closes #44365 See merge request gitlab-org/gitlab-ce!17810 | ||||
| * | | | | | Fix "A copy of Gitlab::Metrics::Methods" have been removed error | Stan Hu | 2018-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #44365 |