summaryrefslogtreecommitdiff
path: root/spec/javascripts/diffs
Commit message (Collapse)AuthorAgeFilesLines
* Impove diff discussion datamr-diff-dataPhil Hughes2018-10-242-7/+5
| | | | Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
* Fixed failing specsPhil Hughes2018-10-232-12/+4
| | | | Added tests to file row truncated text computed prop
* Add list mode to file browser in diffsPhil Hughes2018-10-232-0/+98
| | | | | | | | | | | This adds toggle buttons to switch between file & tree list. For file list, it renders the truncated paths with the ellipsis at the start of the path. When focusing the input, it hides the toggle buttons. On blur, the buttons get shown again. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51859
* Prettify all spec filesMike Greiling2018-10-175-13/+12
|
* enable jasmine/new-line-before-expectJohann Hubert Sonntagbauer2018-10-178-0/+39
|
* Fix broken file name navigation on MRsJacques Erasmus2018-10-111-3/+12
|
* enable jasmine/prefer-jasmine-matcherJohann Hubert Sonntagbauer2018-10-093-8/+6
|
* Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-053-6/+7
|
* Merge branch '49329-mr-show-commit-details' into 'master'Fatih Acet2018-10-041-0/+35
|\ | | | | | | | | | | | | Add signature badge and pipeline status to commit details in MR diff Closes #49329 See merge request gitlab-org/gitlab-ce!22079
| * Add pipeline status to diffs/commit_item49329-mr-show-commit-detailsPaul Slaughter2018-10-031-0/+17
| | | | | | | | | | **Notes:** - Also exposes commit.pipeline_status_path in diffs.json
| * Add signature badge to diffs/commit_itemPaul Slaughter2018-10-031-0/+18
| | | | | | | | | | **Notes:** - Also exposes commit.signature_html in diffs.json
* | Merge branch '51958-fix-mr-discussion-loading' into 'master'Phil Hughes2018-10-044-39/+18
|\ \ | | | | | | | | | | | | | | | | | | Fix MR discussion not loaded issue Closes #51958 See merge request gitlab-org/gitlab-ce!21982
| * | Fix MR discussion not loaded issue51958-fix-mr-discussion-loadingMark Chao2018-10-014-39/+18
| | | | | | | | | | | | | | | | | | Display `formatter` as the sole content of `position` object. This means `diff_file` data is not referenced, which is the caseu of "IOError: not opened for reading".
* | | Merge branch '_acet-fix-diff-file-header' into 'master'Mike Greiling2018-10-031-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix showing diff file header for renamed files Closes #48887 See merge request gitlab-org/gitlab-ce!22089
| * | Fix showing diff file header for renamed filesFatih Acet2018-10-031-1/+1
| |/
* | Added file tree to merge request diffsPhil Hughes2018-10-038-110/+430
|/ | | | | | | | | | | | | | | This file tree displays all the diff files in a tree like format Each file is taken and converted into a tree with folders Each folder can be toggled open & closed Clicking a file will scroll to the diff file & highlight with a glow affect Searching the tree list will search only files & return a list of the files without any folders Each file row contains an icon to show changed, new file or deleted Each row will also contain the added & removed lines count Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
* Resolve "Commit details are not displayed when reviewing an MR commit by commit"Paul Slaughter2018-09-264-1/+171
|
* Fixed utils specPhil Hughes2018-09-211-1/+2
|
* Changed `true` string to a booleanPhil Hughes2018-09-211-2/+2
| | | | Fixed toBeTruthy to toBe(true) in spec
* Fixed karma spec for getNoteFormDataPhil Hughes2018-09-211-0/+1
| | | | Fixed toggling new notes caused by not returning the stores discussion
* Use returned discussion from APIPhil Hughes2018-09-212-25/+50
| | | | | | | We now use the returned discussion instead of re-fetching all of the discussions and filtering out the ones we don't need. This speeds up the process of creating a diff discussions by saving us another API request before we can render the discussion
* Resolve "Link to file in Changes tab of MR no longer works for all files ↵André Luís2018-09-201-17/+139
| | | | after incremental rendering improvement"
* Changed isDiscussionApplicableToLine to accept an objectPhil Hughes2018-09-181-14/+22
|
* Added specs to isDiscussionApplicableToLinePhil Hughes2018-09-171-10/+35
| | | | It now tests for the latest diff check
* Updated LegacyDiffNote logicPhil Hughes2018-09-172-4/+22
|
* Moved legacy diff note check into util methodPhil Hughes2018-09-171-4/+4
| | | | Un-commented out expect checks in mutation spec
* Fixed diff store actions specPhil Hughes2018-09-173-0/+139
| | | | Updated diff mutations and utils spec to check for legacy notes
* Create specs for diffs/components/app and update modules to export factory ↵Paul Slaughter2018-09-144-7/+93
| | | | functions
* Display click to expand on collapsed diffsAndré Luís2018-09-131-0/+12
|
* Resolve "On master, inline diff view contains extra `+` and `-` signs"Tim Zallmann2018-09-101-3/+12
|
* Resolve "Merge requests show outdated discussions on changes tab"André Luís2018-09-083-2/+125
|
* Merge branch 'tz-mr-new-datastructure' into 'master'Mike Greiling2018-09-078-93/+403
|\ | | | | | | | | Vue MR Page - Data structure update See merge request gitlab-org/gitlab-ce!21062
| * Adapted so utils + actions don't include any mutations and mutations are ↵Tim Zallmann2018-09-072-42/+86
| | | | | | | | always against state
| * Fixes based on MR discussion around naming, mutations, handling of stateTim Zallmann2018-09-071-0/+1
| |
| * Made the discussion tests artificial to have them stable, mocked RAF + RICTim Zallmann2018-09-071-46/+97
| |
| * Added new tests for newly added mutations, actions, utilsTim Zallmann2018-09-073-3/+218
| |
| * Fix Linting ErrorTim Zallmann2018-09-071-1/+0
| |
| * Fix for Karma, Static Analysis and RSPec for MR PageTim Zallmann2018-09-073-4/+5
| |
| * Fixes for Karma testsTim Zallmann2018-09-072-21/+26
| |
| * Fix for Getter + LintingTim Zallmann2018-09-071-36/+3
| |
| * Fixes for Karma TestsTim Zallmann2018-09-073-31/+33
| |
| * Fixed Problems with Inline View + SpecsTim Zallmann2018-09-072-0/+25
| |
* | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-071-5/+5
|/
* Added constants for Render values + Optimised for LoopTim Zallmann2018-08-131-0/+18
|
* Fix for diff_file specsTim Zallmann2018-08-082-1/+10
|
* Porting MR Vue Memory Fixes to current masterTim Zallmann2018-08-082-1/+103
|
* Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-011-8/+33
| | | | This reverts commit bd5b177b0fc48d77b5069b112faf36d151221be7.
* Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master'Filipa Lacerda2018-08-016-107/+9
|\ | | | | | | | | Remove fixes for MR refactor regressions from master See merge request gitlab-org/gitlab-ce!20920
| * Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"André Luís2018-08-015-69/+0
| | | | | | | | | | This reverts commit 740ae2d194f3833e224c326cc909d833c5807484, reversing changes made to 1ba47de5fef7a86a453e97a574741d3dba85c521.
| * Revert "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-011-33/+8
| | | | | | | | | | This reverts commit 5ba542b1094bd8fd95d48d2ac834fd8605cf8fee, reversing changes made to 32c831ea2b8425c71c790b67fb8f2170f3d9955a.