summaryrefslogtreecommitdiff
path: root/spec/javascripts/diffs
Commit message (Collapse)AuthorAgeFilesLines
* Show toggle tree button on merge request commitsPhil Hughes2018-11-222-40/+21
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
* Rename diffs store variableGeorge Tsiolis2018-11-152-7/+7
|
* Made diff & note data consistentPhil Hughes2018-11-1415-423/+422
| | | | | | | | | | This caused many pain points when working with it. Part of the data was camel cased the other snake case. Other parts where snake case & then getting converted in components, this conversion has the potential for leaking memory. This changes that & makes it consistent with what it returned from the API, snake case.
* Fix collapsed files not fully fully expandingPhil Hughes2018-11-131-0/+22
| | | | | | | This fixes files that are collapsed by default not expanding when the expand all button is clicked. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53866
* Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-121-2/+2
|\ | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-091-2/+2
| |
* | Changed diff tree filtering to pathPhil Hughes2018-11-121-1/+1
|/ | | | | | | Previously it was using name which could make it hard to filter for the file you want in a certain folder. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53781
* Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-071-2/+2
| | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
* Show expand all button on merge request diffsPhil Hughes2018-11-071-4/+4
| | | | | | | | This restores the behaviour of showing the expand all button on diffs even when only a single file is collapsed. Previously the button would only show when all files are collapsed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
* Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'Douwe Maan2018-11-071-2/+2
|\ | | | | | | | | Comment on any expanded diff line on MRs See merge request gitlab-org/gitlab-ce!22398
| * Comment on any expanded diff line on MRsOswaldo Ferreira2018-11-061-2/+2
| |
* | Restored width & height propertiesPhil Hughes2018-11-063-6/+43
| |
* | Re-implemented image commenting on diffsPhil Hughes2018-11-056-13/+257
|/ | | | | | | | | | | | | | | | | | | | | This re-implements image commenting in merge request diffs. This feature was previously lost when the merge request page was refactored into Vue. With this, we create an overlay component. The overlay component handles displaying the comment badges and the comment form badge. Badges are displayed based on the position attribute sent with the discussion. Comment forms for diff files are controlled through a different state property. This is so we don't tie comment forms to diff files directly creating deep nested state. Instead we create a flat array which holds the file hash & the X & Y position of the comment form. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
* Fixes diff discussions not being fully removedmr-diff-discussion-deletionPhil Hughes2018-10-301-0/+1
| | | | | | | | | | | | This fixes a bug where a discussion on a none changed line would not get fully removed and therefore leave the comment row empty. This was caused by the discussiob being added to the right when it shouldnt of been This also fixes a very rare edge case where discussions would get added twice to diff lines causing a Vue rendering warning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53317
* Fix broken "Show whitespace changes" button on MR "Changes" tabJacques Erasmus2018-10-292-1/+167
|
* Fixed action & mutation specsPhil Hughes2018-10-252-44/+29
|
* 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
| |