Commit Graph

165 Commits

Author SHA1 Message Date
Phil Hughes 12edecd002
Add headers to files in the tree list on merge requests
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54807
2019-01-08 09:31:23 +00:00
Tim Zallmann 33cfeea176 Dryed code in commit_item by adding another computed prop 2019-01-07 11:04:59 +01:00
Tim Zallmann 1484a7eb7d Added User Popovers to Commit Items and Member Lists 2019-01-04 16:34:01 +01:00
Stan Hu ef304611ad Fix commit SHA not showing in merge request compare dropdown
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17011
in GitLab 11.1 refactored the merge request diff comparison
functionality but omitted the commit SHA due to a change in
the API (truncated_commit_sha -> short_commit_sha).

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55822
2018-12-31 09:18:29 -08:00
Francisco Javier López 5a3e6fdff9
Fixing image lfs bug and also displaying text lfs
This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812,
fixes a problem creating a displaying image diff notes when the image
is stored in LFS. The main problem was that `Gitlab::Diff::File` was
returning an invalid valid in `text?` for this kind of files.

It also fixes a rendering problem with other LFS files, like text
ones. They LFS pointer shouldn't be shown when LFS is enabled
for the project, but they were.
2018-12-27 16:51:07 +01:00
Sam Bigelow 9c18798275 Utilize :key to minimize extra rerenders
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.
2018-12-17 20:25:41 -05:00
Nick Thomas 8d2e1b724b Merge branch '54786-mr-empty-file-display' into 'master'
Display empty files properly on MR diffs

Closes #54786

See merge request gitlab-org/gitlab-ce!23671
2018-12-15 12:21:54 +00:00
Sean Nichols 9f9eb03f3d Fix diff table rendering for empty files and improve tests 2018-12-13 23:52:31 -05:00
Oswaldo Ferreira ed3034bbb7 Allow suggesting single line changes in diffs 2018-12-13 19:17:19 +00:00
Phil Hughes ee2f3cac35
Fix diff changes empty state
The empty state now only gets shown when no files exist in the branch.
If the user is reviewing 2 versions with no files, we don't show the state.

Refactors the diff app spec to use Vue test utils.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48635
2018-12-13 10:57:45 +00:00
Sean Nichols 4d2448e03a Add tests and move empty file message into own component 2018-12-13 01:49:32 -05:00
Sean Nichols 4ae1591b97 Move empty file message to diff_content component 2018-12-12 23:07:49 -05:00
Sean Nichols e6a3898e90 Fix Prettier formatting and add MR to changelog 2018-12-11 23:49:04 -05:00
Sean Nichols 05dcb2dd76 Display empty files properly on MR diffs 2018-12-11 23:49:04 -05:00
André Luís 85daddbec9 Resolve "Navigating unresolved discussions on Merge Request page" 2018-12-08 07:19:03 +00:00
Phil Hughes 2ed65be1c3
Fixed renamed and mode changed diff viewers
Renders mode changed and renamed file merge request diff
viewers on the frontend.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607
2018-12-06 14:39:29 +00:00
Phil Hughes 7aa8803083 Updated variable name to forceExpanded 2018-12-04 13:27:18 +00:00
Phil Hughes b8ee8c2787
Fixed multiple diff line discussions not expanding
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600
2018-12-04 10:58:02 +00:00
Sam Bigelow 44a0121ad4 Resolve "Merge request refactor does not highlight selected line" 2018-11-30 08:48:47 +00:00
Filipa Lacerda 822fa649eb Merge branch 'discussion-perf-fixes' into 'master'
Improve discussion rendering performance

Closes #51506

See merge request gitlab-org/gitlab-ce!22935
2018-11-28 09:45:36 +00:00
Phil Hughes adf8ad9eee
Improve discussion rendering performance
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
2018-11-27 11:40:39 +00:00
Winnie Hellmann 8ef5115795 Replace convertPermissionToBoolean with parseBoolean 2018-11-27 09:18:48 +01:00
Filipa Lacerda d993f4b1ec Merge branch 'mr-sticky-headers' into 'master'
Made diff file headers sticky

Closes #48816

See merge request gitlab-org/gitlab-ce!23249
2018-11-22 15:10:24 +00:00
Phil Hughes ce91c326f9
Made diff file headers sticky
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48816
2018-11-22 12:24:45 +00:00
Phil Hughes 93c614ce92
Show toggle tree button on merge request commits
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
2018-11-22 12:04:18 +00:00
George Tsiolis 8826962d21 Update `gitlab` npm namespace 2018-11-21 23:41:38 +02:00
George Tsiolis f252156784 Add `hover` on button tooltips
See https://gitlab.com/gitlab-org/gitlab-ui/issues/89
2018-11-21 23:11:41 +02:00
George Tsiolis 0642404b08 Remove the tooltip trigger suffix 2018-11-21 23:11:41 +02:00
George Tsiolis 02e7497166 Replace tooltip directive with gl-tooltip directive in badges, cycle analytics, and diffs 2018-11-21 23:11:41 +02:00
Mike Greiling 5b9495c5db
Prettify all the things 2018-11-20 09:30:01 -06:00
Clement Ho 8b1f2823a2 Use @gitlab npm namespace 2018-11-16 19:29:11 +00:00
Phil Hughes 234563ba30
Made diff & note data consistent
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.
2018-11-14 19:16:46 +00:00
Phil Hughes 8e265bc359
Fix collapsed files not fully fully expanding
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
2018-11-13 13:42:04 +00:00
Filipa Lacerda 9ce0fa1fb5 Merge branch 'mr-tree-filter-path-name' into 'master'
Changed diff tree filtering to path

Closes #53781

See merge request gitlab-org/gitlab-ce!22978
2018-11-12 15:20:23 +00:00
Phil Hughes eaca2033d5
Changed diff tree filtering to path
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
2018-11-12 14:42:22 +00:00
Phil Hughes cfedc31b7a
Improve initial rendering of discussion notes
This improves the initial rendering performance of notes
by only creating a new TaskList for the whole app,
rather than on a per-note component basis.
2018-11-09 09:55:37 +00:00
Sean McGivern b3b9817e51 Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"

See merge request gitlab-org/gitlab-ce!22891
2018-11-08 08:51:30 +00:00
Fatih Acet cd5ddc4f2e Discussions redesign 2018-11-08 07:58:45 +00:00
Oswaldo Ferreira 198402b38b Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
This reverts commit a82a595728, reversing
changes made to e7df959b8f.
2018-11-07 19:57:26 -02:00
Phil Hughes e354a64e89
Show expand all button on merge request diffs
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
2018-11-07 13:03:13 +00:00
Douwe Maan a82a595728 Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'
Comment on any expanded diff line on MRs

See merge request gitlab-org/gitlab-ce!22398
2018-11-07 11:56:46 +00:00
Clement Ho c4aa33fc8b Remove gitlab-ui loading icon from global 2018-11-07 10:06:15 +00:00
Filipa Lacerda e1e315ee28 Merge branch 'mr-image-commenting' into 'master'
Re-implemented image commenting on diffs

Closes #48956

See merge request gitlab-org/gitlab-ce!22443
2018-11-07 10:04:54 +00:00
Oswaldo Ferreira ec66ef1b74 Comment on any expanded diff line on MRs 2018-11-06 17:39:31 -02:00
Phil Hughes 35faecb06b
Restored width & height properties 2018-11-06 10:17:59 +00:00
Clement Ho 701f0f5e55 Remove gitlab-ui's tooltip from global 2018-11-05 16:48:55 +00:00
Phil Hughes f7df9ddb52
Re-implemented image commenting on diffs
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
2018-11-05 14:02:41 +00:00
Nick Thomas 2ae6c47ddd Merge branch 'qa-batch-comments-e2e-tests' into 'master'
QA Selectors for Batch Comment E2E Automation

See merge request gitlab-org/gitlab-ce!22681
2018-11-05 11:34:10 +00:00
Mike Greiling 160157a92b
Prettify remaining files with differences in CE and EE 2018-10-31 14:33:12 -05:00
Phil Hughes 605e7fddc8
Fixes diff discussions not being fully removed
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
2018-10-30 10:41:25 +00:00