Paul Slaughter
8cffa55b2c
CE - FE fix diffs specs leaking store
...
- Export mr_notes module as function
- Update specs refs of mr_notes/stores to factory
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15097
2019-08-11 18:58:46 -05:00
André Luís
ccce365ac5
Update karma for new expansion cell markup
...
Also cleans up spec by:
- Add missing `afterEach ... $destroy`
- Add missing `done` call when `$nextTick` was used
2019-08-11 23:46:49 +00:00
Samantha Ming
fc0ff7cf03
Replace ... with new expansion options
...
- expand upwards
- expand downwards
- expand all
in both inline and parallel views
2019-08-10 02:36:32 +00:00
Natalia Tepluhina
9613a34a24
Fixed editing form
...
- applied functional component patch
- fixed border radius for list
- fixed Karma test to take a correct li amount
2019-07-09 04:22:48 +00:00
Natalia Tepluhina
d4151b14c2
Rebased and squashed commits
...
- all commits squashed to make danger review happy
2019-07-03 08:26:57 +00:00
Phil Hughes
d2fd6bd510
Added diff suggestion popover
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
2019-06-14 14:01:24 +01:00
Marcel van Remmerden
a8eedd0a09
User link styling for commits
2019-06-10 17:43:41 +00:00
Annabel Dunstone Gray
cc8e7ea205
Remove unused avatar sizes
...
- Update avatars to use only sizes from the 8px grid
2019-05-31 19:34:26 -05:00
Paul Slaughter
878e69299b
Rename vue_component_helper to text_helper
...
**Why?**
This file only contains a few text based helper functions.
It has nothing to do with Vue or Vue components.
2019-05-16 06:40:18 -05:00
Phil Hughes
9d24d4a8fd
Impove the performance of expanding full diff
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597
2019-05-03 08:33:15 +01:00
Paul Gascou-Vaillancourt
911701ae47
Extract discussion notes into new component
...
- Moved discussion notes out of `NoteableDiscussion` component into a
new `DiscussionNotes` component
- Wrote Jest tests for the new `DiscussionNotes` component
- Updated Jest config for emojis fixtures
- Updated Karma tests `NoteableDiscussion` to match its new structure
- Convert `DiffDiscussions` tests to use Vue test utils
2019-05-01 10:04:07 +00:00
Fatih Acet
a1179e5e60
Fix showing HTML content in view file tooltip
2019-04-16 00:28:20 +02:00
Phil Hughes
45ef6fd777
Fixed fluid layout preference not being respected in diffs
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
2019-04-12 09:32:05 +01:00
Sam Bigelow
bf47270e90
Improve diff navigation header
...
- Compare versions header is full width except in the unified diff mode
with no tree sidebar
- Bar is always full width, but the content within stays centered when
unified and no tree sidebar
- File header is the same height as the "Compare versions header"
- aligns with the design system grid guidelines => 56px
- Diff file headers use a button group, switch icon order to open file
externally being the last option, all buttons will become icon buttons
(icon delivery by @dimitrieh)
- If a file header becomes sticky no rounded corner/double border
problem is visible anymore
2019-04-05 14:57:01 -04:00
Phil Hughes
eebf24ead5
Fixes duplicate diff too large error messages
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
2019-04-02 13:24:36 +01:00
Clement Ho
f87ff7af53
Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'
...
Fix bug where clicking file header in diff refreshes page
Closes #57669
See merge request gitlab-org/gitlab-ce!26422
2019-04-01 15:28:37 +00:00
Sam Bigelow
a9441396da
Scroll to diff file when clicking on file name
...
- Add an ID to the diff content
- handle clicking on file name in diffFileHeader when it is not a link
to another page but rather a link to an element on the page
2019-03-29 14:56:53 -04:00
Phil Hughes
3b158409b3
Remove expand diff to full file feature flag
2019-03-26 18:20:02 +00:00
Winnie Hellmann
514ee63826
Move some tests from Karma to Jest
2019-03-23 17:53:46 +01:00
Phil Hughes
27fa7b9ca8
Collapse diff tree is only one file is present
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53139
2019-03-19 11:34:21 +00:00
Phil Hughes
c36095b2e3
Fix expand all button not working
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
2019-03-11 13:09:36 +00:00
Phil Hughes
b14de8e1f5
Add option to expand diff to full file
...
The user can also toggle between the diff changes and
the full file diff.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
2019-03-06 15:51:44 +08:00
Phil Hughes
294f0f3991
CE backport of batch-comments-ee-store-module
2019-03-04 11:27:57 +00:00
Natalia Tepluhina
edfdf568d3
Resolve "Add missing karma tests to the the MR Diff components"
2019-02-28 08:23:17 +00:00
Denys Mishunov
0aff8e2753
Set up basic keyboard next/previous navigation in diff list
...
Mousetrap is used as the help-tool to listen to keystrokes
Added currentDiffIndex getter to store that holds
the index of currently active diff file in the list
Instead of computing it on the component, we will take advantage of it
being available for all components in DiffsApp
Testing keyboard navigation and jumpToFile()
2019-02-27 09:12:13 +00:00
Filipa Lacerda
fe10964a68
Merge branch 'fix-diffs-not-rendering' into 'master'
...
Fix diff files not rendering
See merge request gitlab-org/gitlab-ce!25358
2019-02-18 16:19:19 +00:00
Phil Hughes
512f9624fa
Fix diff files not rendering
...
Fixes some diff files not rendering when the renderIt
property is updated.
Previously it was using a local copy of renderIt which meant
Vue wouldn't update it when the files renderIt property was updates
2019-02-18 15:16:04 +00:00
Filipa Lacerda
fea813ab93
Merge branch 'diff-tree-resizable' into 'master'
...
Make the file tree in merge requests resizable
Closes #51857
See merge request gitlab-org/gitlab-ce!25097
2019-02-18 12:53:03 +00:00
Natalia Tepluhina
bf8f32da7f
Replaced part of diff file properties with diff viewer
...
- replaced file.too_large
- replaced file.text
- replaced file.collapsed
2019-02-15 17:56:50 +00:00
Phil Hughes
d17de657fe
Make the file tree in merge requests resizable
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51857
2019-02-15 10:33:33 +00:00
Phil Hughes
81597427d0
Merge branch '52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-view' into 'master'
...
Resolve "Lines changed statistics is not easily visible in MR changes view"
Closes #52347
See merge request gitlab-org/gitlab-ce!24569
2019-02-07 08:05:53 +00:00
Sam Bigelow
2a2f48a5b1
Clearly display diff statistics for MRs
...
Put the statistics in the compare-versions header for the entire MR
Put them in the file header for each individual file
2019-02-06 11:11:09 -06:00
Phil Hughes
6e5461d67f
Added fuzzy file finder to merge requests
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
2019-02-05 11:29:49 +00:00
Phil Hughes
2f40aa68d9
Added dropdown for diff settings
...
Dropdown includes buttons for tree view rendering mode
and buttons for the compare view (inline or side-by-side)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55491
2019-01-24 14:48:03 +00:00
Sam Bigelow
a0146dceb6
Resolve "Merge request file browser should always be possible show/hide"
2019-01-22 08:29:41 +00:00
Natalia Tepluhina
7407dfdc20
Resolve "In Merge Request diff screen, master is not a hyperlink"
2019-01-16 13:18:10 +00:00
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
30038a40b0
Fixed Data Attribute Test
2019-01-06 15:57:15 +01:00
Tim Zallmann
7b325fa60c
Added Spec for Vue Commit Item
2019-01-06 08:59:39 +01: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
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
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
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