summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix Vuex module structre for diffs and notesvuex_note_modulesSimon Knox2018-03-268-63/+83
* Review fixes.Fatih Acet2018-03-247-32/+52
* Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce...Simon Knox2018-03-2317-28/+301
|\
| * Implement fetching more context lines.Fatih Acet2018-03-2317-56/+350
* | remove vue_mr_discussions cookie checksSimon Knox2018-03-236-126/+153
* | fix duplicate #notes elementSimon Knox2018-03-231-1/+2
* | fix View File link for replaced imagesSimon Knox2018-03-232-23/+31
* | Merge branch 'changes_tab_vue_refactoring' of gitlab.com:gitlab-org/gitlab-ce...Simon Knox2018-03-231-2/+0
|\ \ | |/
| * copy to clipboard button for sticky file pathSimon Knox2018-03-211-2/+19
| * MR Diffs refactoring.Fatih Acet2018-03-2143-38/+1775
| * Merge branch '_mr-refactor-part-9' into '_mr-refector-review-target'Tim Zallmann2018-03-211-0/+28
| |\
| | * MR Diffs Refactor Part 09: Diffs app.Fatih Acet2018-03-211-0/+28
| * | Merge branch '_mr-refactor-part-5' into '_mr-refector-review-target'Tim Zallmann2018-03-214-11/+45
| |\ \
| | * | MR Diffs Refactor Part 05: New getters for notes store._mr-refactor-part-5Fatih Acet2018-03-194-11/+45
| | |/
| * | Merge branch '_mr-refactor-part-2' into '_mr-refector-review-target'Tim Zallmann2018-03-216-12/+100
| |\ \
| | * | MR Diffs Refactor Part 02: Minor changes for refactor._mr-refactor-part-2Fatih Acet2018-03-196-12/+100
| | |/
| * | Merge branch '_mr-refactor-part-6' into '_mr-refector-review-target'Tim Zallmann2018-03-212-2/+36
| |\ \
| | * | MR Diffs Refactor Part 06: Notes styling for refactored version._mr-refactor-part-6Fatih Acet2018-03-192-2/+36
| | |/
* | | add Edit, View and Toggle Note buttons to diff file headerSimon Knox2018-03-233-2/+71
* | | copy to clipboard button for sticky file pathSimon Knox2018-03-211-2/+19
* | | MR Diffs refactoring.Fatih Acet2018-03-2154-63/+1984
|/ /
* | Merge branch '_mr-refactor-part-4' into '_mr-refector-review-target'Tim Zallmann2018-03-196-10/+20
|\ \
| * | MR Diffs Refactor Part 04: Minor refactor on old code._mr-refactor-part-4Fatih Acet2018-03-196-10/+20
| |/
* | Merge branch '_mr-refactor-part-3' into '_mr-refector-review-target'Tim Zallmann2018-03-196-83/+62
|\ \ | |/ |/|
| * MR Diffs Refactor Part 03: Remove legacy stuff and prettify._mr-refactor-part-3Fatih Acet2018-03-196-83/+62
|/
* Merge branch 'le-issue-boards-height-calculation' into 'master'Phil Hughes2018-03-194-61/+80
|\
| * Make issue boards height calculation clearer and remove magic numbersLukas Eipert2018-03-194-61/+80
|/
* Merge branch 'tc-package-qa-rename-docs' into 'master'Grzegorz Bizon2018-03-193-3/+3
|\
| * Rename `package-qa` in docsToon Claes2018-03-193-3/+3
|/
* Merge branch 'update-gitlab-ci-yml-services-docs' into 'master'Achilleas Pipinellis2018-03-192-1/+67
|\
| * Copyedit CI services docsAchilleas Pipinellis2018-03-191-56/+33
| * Add CHANGELOG entryupdate-gitlab-ci-yml-services-docsTomasz Maczukin2018-03-141-0/+5
| * Update CI services documnetationTomasz Maczukin2018-03-141-0/+84
* | Merge branch 'update-kubeclient' into 'master'Grzegorz Bizon2018-03-1912-22/+23
|\ \
| * \ Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-17233-3409/+5755
| |\ \
| * | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)Pirate Praveen2018-03-1510-10/+10
| * | | Update kubeclient 2.2.0 -> 3.0Pirate Praveen2018-03-142-12/+12
* | | | Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' i...Mike Greiling2018-03-195-32/+43
|\ \ \ \
| * | | | Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-085-32/+43
* | | | | Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil Trzciński2018-03-186-7/+55
|\ \ \ \ \
| * | | | | Fix specfix/sm/clarify-ambiguous-with_artifacts-implicationShinya Maeda2018-03-161-1/+1
| * | | | | Use with_artifacts_archive name. Add specShinya Maeda2018-03-154-6/+42
| * | | | | Fix corrupted testShinya Maeda2018-03-151-1/+1
| * | | | | Add feartue spec. Fix failed testShinya Maeda2018-03-152-1/+13
| * | | | | Add rubocop:disable GitlabSecurity/PublicSendShinya Maeda2018-03-151-1/+1
| * | | | | Clarify ambiguous with_artifacts implicationShinya Maeda2018-03-153-6/+6
* | | | | | Merge branch 'fix-dropzone-project-show' into 'master'Jacob Schatz2018-03-183-4/+44
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix dropzone project showClement Ho2018-03-183-4/+44
|/ / / / /
* | | | | Merge branch 'sh-fix-module-reloading' into 'master'Robert Speicher2018-03-161-1/+1
|\ \ \ \ \
| * | | | | Fix "A copy of Gitlab::Metrics::Methods" have been removed errorStan Hu2018-03-161-1/+1
View Lorry Controller Status