| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42 | GitLab Bot | 2022-02-18 | 1 | -14/+4 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42 | GitLab Bot | 2021-07-20 | 1 | -2/+8 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42 | GitLab Bot | 2021-06-16 | 1 | -116/+0 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43 | GitLab Bot | 2021-04-20 | 1 | -13/+4 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40 | GitLab Bot | 2021-03-16 | 1 | -1/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42 | GitLab Bot | 2021-02-18 | 1 | -1/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42 | Robert Speicher | 2021-01-20 | 1 | -32/+65 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42 | GitLab Bot | 2020-12-17 | 1 | -168/+28 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42 | GitLab Bot | 2020-11-19 | 1 | -2/+6 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-4-stable-ee | GitLab Bot | 2020-09-19 | 1 | -6/+74 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-3-stable-ee | GitLab Bot | 2020-08-20 | 1 | -5/+12 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-2-stable-ee | GitLab Bot | 2020-07-20 | 1 | -0/+9 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-1-stable-ee | GitLab Bot | 2020-06-18 | 1 | -0/+2 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-0-stable-ee | GitLab Bot | 2020-05-20 | 1 | -3/+50 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@12-10-stable-ee | GitLab Bot | 2020-04-20 | 1 | -3/+7 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-24 | 1 | -5/+5 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-20 | 1 | -11/+53 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-13 | 1 | -36/+43 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-14 | 1 | -97/+190 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-12 | 1 | -1/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-26 | 1 | -2/+3 |
| | | |||||
| * | Replace ... with new expansion options | Samantha Ming | 2019-08-10 | 1 | -10/+16 |
| | | | | | | | | | - expand upwards - expand downwards - expand all in both inline and parallel views | ||||
| * | Rebased and squashed commits | Natalia Tepluhina | 2019-07-03 | 1 | -0/+45 |
| | | | | | - all commits squashed to make danger review happy | ||||
| * | Impove the performance of expanding full diff | Phil Hughes | 2019-05-03 | 1 | -13/+20 |
| | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597 | ||||
| * | Add option to expand diff to full file | Phil Hughes | 2019-03-06 | 1 | -2/+38 |
| | | | | | | | The user can also toggle between the diff changes and the full file diff. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054 | ||||
| * | Replaced part of diff file properties with diff viewer | Natalia Tepluhina | 2019-02-15 | 1 | -3/+6 |
| | | | | | | | - replaced file.too_large - replaced file.text - replaced file.collapsed | ||||
| * | Fixed diff rendering causing a duplicate key warning | Phil Hughes | 2019-02-13 | 1 | -0/+1 |
| | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56797 | ||||
| * | Fixed diff tree folders being rendered incorrectly | Phil Hughes | 2019-01-24 | 1 | -2/+3 |
| | | |||||
| * | Trim first char of diff line text on diff discussions | Douwe Maan | 2019-01-22 | 1 | -3/+7 |
| | | | | | | | | | | | | | Before, diff file `higlighted_diff_lines`/`parallel_diff_lines` and diff discussion `truncated_diff_lines` were inconsistent: `text` and `rich_text` on the latter included the leading +/-/<space> character, like on the backend, while the former had no `text` and its `rich_text` had dropped this char. This resulted in a bug when the suggestions feature expected these diff line objects to be identical in format and thus interchangeable, which was not the case. | ||||
| * | Collapses directory structure in merge request tree | Phil Hughes | 2019-01-15 | 1 | -2/+61 |
| | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53069 | ||||
| * | Add headers to files in the tree list on merge requests | Phil Hughes | 2019-01-08 | 1 | -0/+1 |
| | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54807 | ||||
| * | Utilize :key to minimize extra rerenders | Sam Bigelow | 2018-12-17 | 1 | -0/+11 |
| | | | | | | | The diff notes automatically focus on mount, and when using the index (as opposed to line_code) for the v-bind:key, the comment form gets unnecessarily remounted, and therefore refocused. | ||||
| * | Merge branch 'winh-merge-request-diff-discussion-commit-id' into 'master' | Mike Greiling | 2018-12-07 | 1 | -1/+2 |
| |\ | | | | | | | | | Pass commit when posting diff discussions See merge request gitlab-org/gitlab-ce!23371 | ||||
| | * | Pass commit when posting diff discussions | Winnie Hellmann | 2018-12-05 | 1 | -1/+2 |
| | | | |||||
| * | | Fixed renamed and mode changed diff viewers | Phil Hughes | 2018-12-06 | 1 | -1/+5 |
| |/ | | | | | | | Renders mode changed and renamed file merge request diff viewers on the frontend. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607 | ||||
| * | Improve discussion rendering performance | Phil Hughes | 2018-11-27 | 1 | -1/+3 |
| | | | | | | | | | | | | Improve the renderign of new and existing discussions by reducing the number of watchers on each object & array. Previously every discussion change would trigger an update for every discussion component. Also tidied up some components to get them closer to our docs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51506 | ||||
| * | Made diff & note data consistent | Phil Hughes | 2018-11-14 | 1 | -72/+64 |
| | | | | | | | | | | | 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. | ||||
| * | Restored width & height properties | Phil Hughes | 2018-11-06 | 1 | -0/+2 |
| | | |||||
| * | Re-implemented image commenting on diffs | Phil Hughes | 2018-11-05 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Backport CE changes for: [Frontend only] Batch comments on merge requests | André Luís | 2018-10-06 | 1 | -3/+9 |
| | | |||||
| * | Merge branch '51958-fix-mr-discussion-loading' into 'master' | Phil Hughes | 2018-10-04 | 1 | -2/+3 |
| |\ | | | | | | | | | | | | | 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 | 1 | -2/+3 |
| | | | | | | | | | | | | | 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". | ||||
| * | | Added file tree to merge request diffs | Phil Hughes | 2018-10-03 | 1 | -0/+46 |
| |/ | | | | | | | | | | | | | | | 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 | ||||
| * | Changed `true` string to a boolean | Phil Hughes | 2018-09-21 | 1 | -1/+1 |
| | | | | | Fixed toBeTruthy to toBe(true) in spec | ||||
| * | Return discussion object from NotesController#create when return_discussion ↵ | Douwe Maan | 2018-09-21 | 1 | -0/+1 |
| | | | | | param is set | ||||
| * | Changed isDiscussionApplicableToLine to accept an object | Phil Hughes | 2018-09-18 | 1 | -1/+1 |
| | | |||||
| * | Updated latestDiff logic to only be used to LegacyDiffNotes | Phil Hughes | 2018-09-17 | 1 | -2/+2 |
| | | |||||
| * | Updated LegacyDiffNote logic | Phil Hughes | 2018-09-17 | 1 | -2/+5 |
| | | |||||
| * | Re-enable legacy diff notes on merge request diffs | Phil Hughes | 2018-09-17 | 1 | -5/+21 |
| | | | | | | | | | | This re-enables legacy diff notes on the merge request diffs This feature was not workig correctly after the Vue refactor LegacyDiffNotes have no `position`, instead they only have a `line_code` As an extra, this also re-enables commenting on legacy diffs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873 | ||||
| * | Resolve "On master, inline diff view contains extra `+` and `-` signs" | Tim Zallmann | 2018-09-10 | 1 | -1/+2 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |