Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Impove diff discussion datamr-diff-data | Phil Hughes | 2018-10-24 | 2 | -7/+5 |
| | | | | Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956 | ||||
* | Fixed failing specs | Phil Hughes | 2018-10-23 | 2 | -12/+4 |
| | | | | Added tests to file row truncated text computed prop | ||||
* | Add list mode to file browser in diffs | Phil Hughes | 2018-10-23 | 2 | -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 files | Mike Greiling | 2018-10-17 | 5 | -13/+12 |
| | |||||
* | enable jasmine/new-line-before-expect | Johann Hubert Sonntagbauer | 2018-10-17 | 8 | -0/+39 |
| | |||||
* | Fix broken file name navigation on MRs | Jacques Erasmus | 2018-10-11 | 1 | -3/+12 |
| | |||||
* | enable jasmine/prefer-jasmine-matcher | Johann Hubert Sonntagbauer | 2018-10-09 | 3 | -8/+6 |
| | |||||
* | Fix LFS uploaded images not being rendered | Oswaldo Ferreira | 2018-10-05 | 3 | -6/+7 |
| | |||||
* | Merge branch '49329-mr-show-commit-details' into 'master' | Fatih Acet | 2018-10-04 | 1 | -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-details | Paul Slaughter | 2018-10-03 | 1 | -0/+17 |
| | | | | | | | | | | **Notes:** - Also exposes commit.pipeline_status_path in diffs.json | ||||
| * | Add signature badge to diffs/commit_item | Paul Slaughter | 2018-10-03 | 1 | -0/+18 |
| | | | | | | | | | | **Notes:** - Also exposes commit.signature_html in diffs.json | ||||
* | | Merge branch '51958-fix-mr-discussion-loading' into 'master' | Phil Hughes | 2018-10-04 | 4 | -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-loading | Mark Chao | 2018-10-01 | 4 | -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 Greiling | 2018-10-03 | 1 | -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 files | Fatih Acet | 2018-10-03 | 1 | -1/+1 |
| |/ | |||||
* | | Added file tree to merge request diffs | Phil Hughes | 2018-10-03 | 8 | -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 Slaughter | 2018-09-26 | 4 | -1/+171 |
| | |||||
* | Fixed utils spec | Phil Hughes | 2018-09-21 | 1 | -1/+2 |
| | |||||
* | Changed `true` string to a boolean | Phil Hughes | 2018-09-21 | 1 | -2/+2 |
| | | | | Fixed toBeTruthy to toBe(true) in spec | ||||
* | Fixed karma spec for getNoteFormData | Phil Hughes | 2018-09-21 | 1 | -0/+1 |
| | | | | Fixed toggling new notes caused by not returning the stores discussion | ||||
* | Use returned discussion from API | Phil Hughes | 2018-09-21 | 2 | -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ís | 2018-09-20 | 1 | -17/+139 |
| | | | | after incremental rendering improvement" | ||||
* | Changed isDiscussionApplicableToLine to accept an object | Phil Hughes | 2018-09-18 | 1 | -14/+22 |
| | |||||
* | Added specs to isDiscussionApplicableToLine | Phil Hughes | 2018-09-17 | 1 | -10/+35 |
| | | | | It now tests for the latest diff check | ||||
* | Updated LegacyDiffNote logic | Phil Hughes | 2018-09-17 | 2 | -4/+22 |
| | |||||
* | Moved legacy diff note check into util method | Phil Hughes | 2018-09-17 | 1 | -4/+4 |
| | | | | Un-commented out expect checks in mutation spec | ||||
* | Fixed diff store actions spec | Phil Hughes | 2018-09-17 | 3 | -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 Slaughter | 2018-09-14 | 4 | -7/+93 |
| | | | | functions | ||||
* | Display click to expand on collapsed diffs | André Luís | 2018-09-13 | 1 | -0/+12 |
| | |||||
* | Resolve "On master, inline diff view contains extra `+` and `-` signs" | Tim Zallmann | 2018-09-10 | 1 | -3/+12 |
| | |||||
* | Resolve "Merge requests show outdated discussions on changes tab" | André Luís | 2018-09-08 | 3 | -2/+125 |
| | |||||
* | Merge branch 'tz-mr-new-datastructure' into 'master' | Mike Greiling | 2018-09-07 | 8 | -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 Zallmann | 2018-09-07 | 2 | -42/+86 |
| | | | | | | | | always against state | ||||
| * | Fixes based on MR discussion around naming, mutations, handling of state | Tim Zallmann | 2018-09-07 | 1 | -0/+1 |
| | | |||||
| * | Made the discussion tests artificial to have them stable, mocked RAF + RIC | Tim Zallmann | 2018-09-07 | 1 | -46/+97 |
| | | |||||
| * | Added new tests for newly added mutations, actions, utils | Tim Zallmann | 2018-09-07 | 3 | -3/+218 |
| | | |||||
| * | Fix Linting Error | Tim Zallmann | 2018-09-07 | 1 | -1/+0 |
| | | |||||
| * | Fix for Karma, Static Analysis and RSPec for MR Page | Tim Zallmann | 2018-09-07 | 3 | -4/+5 |
| | | |||||
| * | Fixes for Karma tests | Tim Zallmann | 2018-09-07 | 2 | -21/+26 |
| | | |||||
| * | Fix for Getter + Linting | Tim Zallmann | 2018-09-07 | 1 | -36/+3 |
| | | |||||
| * | Fixes for Karma Tests | Tim Zallmann | 2018-09-07 | 3 | -31/+33 |
| | | |||||
| * | Fixed Problems with Inline View + Specs | Tim Zallmann | 2018-09-07 | 2 | -0/+25 |
| | | |||||
* | | Use ResourceLabelEvent for tracking label changes | Jan Provaznik | 2018-09-07 | 1 | -5/+5 |
|/ | |||||
* | Added constants for Render values + Optimised for Loop | Tim Zallmann | 2018-08-13 | 1 | -0/+18 |
| | |||||
* | Fix for diff_file specs | Tim Zallmann | 2018-08-08 | 2 | -1/+10 |
| | |||||
* | Porting MR Vue Memory Fixes to current master | Tim Zallmann | 2018-08-08 | 2 | -1/+103 |
| | |||||
* | Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'" | André Luís | 2018-08-01 | 1 | -8/+33 |
| | | | | This reverts commit bd5b177b0fc48d77b5069b112faf36d151221be7. | ||||
* | Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master' | Filipa Lacerda | 2018-08-01 | 6 | -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ís | 2018-08-01 | 5 | -69/+0 |
| | | | | | | | | | | This reverts commit 740ae2d194f3833e224c326cc909d833c5807484, reversing changes made to 1ba47de5fef7a86a453e97a574741d3dba85c521. | ||||
| * | Revert "Merge branch '_acet-fix-mr-autosave' into 'master'" | André Luís | 2018-08-01 | 1 | -33/+8 |
| | | | | | | | | | | This reverts commit 5ba542b1094bd8fd95d48d2ac834fd8605cf8fee, reversing changes made to 32c831ea2b8425c71c790b67fb8f2170f3d9955a. |