Commit Graph

165 Commits

Author SHA1 Message Date
Douwe Maan 56834e6bb2 Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'
Comment on any expanded diff line on MRs (with feature-flag)

Closes #13950

See merge request gitlab-org/gitlab-ce!22914
2018-11-12 15:36:48 +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
Oswaldo Ferreira f9b4130bb7 Comment on any expanded diff line on MRs 2018-11-09 16:56:48 -02:00
Phil Hughes a3fbde3512
Init task list when creating new note & discussion 2018-11-09 11:09:56 +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
at.ramya 75cfba9df5 Updating selectors for diff line 2018-10-30 14:42:51 +05:30
at.ramya 956912e542 QA Selectors for Batch Comment E2E Automation 2018-10-30 14:42:51 +05:30
at.ramya 5722f63f2d Updating selectors for diff line 2018-10-30 14:42:51 +05:30
at.ramya 25b658cf65 QA Selectors for Batch Comment E2E Automation 2018-10-30 14:42:50 +05:30
Clement Ho df587c15c4 Update gitlab-ui to 1.9.0 2018-10-29 23:16:10 +00:00
Jacques Erasmus 4508343d16 Fix broken "Show whitespace changes" button on MR "Changes" tab 2018-10-29 16:16:40 +00:00
Phil Hughes 0fba7cca36
Update the state, not a param
Also fixed a bug where discussions wouldn't be assigned to a line
when switching from discussion tab to changes tab
2018-10-25 12:04:34 +01:00
Phil Hughes 80a689fab8
Impove diff discussion data
Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
2018-10-24 13:30:30 +01:00
Phil Hughes 3b3aa28c4c
Use convertPermissionToBoolean to get a boolean 2018-10-23 19:24:48 +01:00
Phil Hughes b07a0167d0
Changed list view tooltip 2018-10-23 11:14:04 +01:00
Phil Hughes 687b96e82f
Updated file tree icon 2018-10-23 09:12:38 +01:00
Phil Hughes c7969568b7
Store tree list preference in localStorage
Fixed clear search button not clearing
2018-10-23 09:12:38 +01:00
Phil Hughes d95465db2c
Dynamically truncate the text in the file row 2018-10-23 09:12:37 +01:00
Phil Hughes 2d00e7fce5
Add list mode to file browser in diffs
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
2018-10-23 09:12:36 +01:00
Mike Greiling 4d0db16f97
Prettify diff_notes diffs and droplab modules 2018-10-16 11:52:35 -05:00
George Tsiolis 469dc95a95 Replace `<i>` in vue components with `<icon>` 2018-10-15 18:35:00 +00:00
Filipa Lacerda 8d9f46706f Merge branch '52361-fix-file-tree-mobile' into 'master'
Resolve "Make file browser hidden by default for mobile screens" and improve layout in small screens too

Closes #52361

See merge request gitlab-org/gitlab-ce!22273
2018-10-12 11:16:55 +00:00
André Luís 52cf955b89 Improve MR file tree on small screens 2018-10-11 23:33:38 +01:00
Jacques Erasmus a577cfcbb2 Fix broken file name navigation on MRs 2018-10-11 22:32:28 +00:00
André Luís 8e5c0e68ec Backport CE changes for: [Frontend only] Batch comments on merge requests 2018-10-06 17:16:40 +00:00
Oswaldo Ferreira caf10464c0 Fix LFS uploaded images not being rendered 2018-10-05 22:36:20 +00:00
Fatih Acet d7a3ccb4ce Merge branch '49329-mr-show-commit-details' into 'master'
Add signature badge and pipeline status to commit details in MR diff

Closes #49329

See merge request gitlab-org/gitlab-ce!22079
2018-10-04 11:37:33 +00:00
Phil Hughes 14ed916cf2 Merge branch '51958-fix-mr-discussion-loading' into 'master'
Fix MR discussion not loaded issue

Closes #51958

See merge request gitlab-org/gitlab-ce!21982
2018-10-04 07:37:24 +00:00
Mike Greiling dfb9ac3a5f Merge branch '_acet-fix-diff-file-header' into 'master'
Fix showing diff file header for renamed files

Closes #48887

See merge request gitlab-org/gitlab-ce!22089
2018-10-03 20:54:04 +00:00
Fatih Acet 8aedb71c49
Fix showing diff file header for renamed files 2018-10-03 21:37:54 +02:00
Paul Slaughter becb86ea4e Add pipeline status to diffs/commit_item
**Notes:**
- Also exposes commit.pipeline_status_path in diffs.json
2018-10-03 13:18:21 -05:00
Paul Slaughter 5a286eb7a3 Add signature badge to diffs/commit_item
**Notes:**
- Also exposes commit.signature_html in diffs.json
2018-10-03 13:18:20 -05:00
Phil Hughes 33c4c5b8f3
Added file tree to merge request diffs
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
2018-10-03 10:05:43 +01:00
Mark Chao f09303b00a Fix MR discussion not loaded issue
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".
2018-10-01 22:37:43 +08:00
Paul Slaughter f390184249 Resolve "Commit details are not displayed when reviewing an MR commit by commit" 2018-09-26 08:28:50 +00:00