80f61b4035
Add latest changes from gitlab-org/gitlab@master
2019-09-18 14:02:45 +00:00
bbdad735a0
Refactor DiffFileHeader tests
...
* Switched from Karma to Jest
* Reorganized tests to have correct semantics
* Removed unused computed properties from component
2019-09-12 05:04:22 +00:00
261f4fe7ac
Fix to show renamed file in mr
2019-08-21 08:23:22 +00:00
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
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
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
d90865a960
Backport from EE
2019-08-01 16:00:36 -05:00
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
d4151b14c2
Rebased and squashed commits
...
- all commits squashed to make danger review happy
2019-07-03 08:26:57 +00:00
d2fd6bd510
Added diff suggestion popover
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
2019-06-14 14:01:24 +01:00
a8eedd0a09
User link styling for commits
2019-06-10 17:43:41 +00:00
7aac4e5c3f
Fix whitespace changes visibility when the related file was initially collapsed
2019-06-05 07:27:08 +00:00
cc8e7ea205
Remove unused avatar sizes
...
- Update avatars to use only sizes from the 8px grid
2019-05-31 19:34:26 -05:00
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
40eb7f72b9
Fixes issues with show whitespace button in diffs
...
Correctly updates the URL without overwriting parameters
Reloads the diff file content without reloading the page
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58852 , https://gitlab.com/gitlab-org/gitlab-ce/issues/42597
2019-05-10 19:06:37 +01:00
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
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
a1179e5e60
Fix showing HTML content in view file tooltip
2019-04-16 00:28:20 +02:00
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
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
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
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
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
3b158409b3
Remove expand diff to full file feature flag
2019-03-26 18:20:02 +00:00
40e3f207cb
Remove now-unnecessary noteable_line class
2019-03-26 14:37:14 +01:00
514ee63826
Move some tests from Karma to Jest
2019-03-23 17:53:46 +01:00
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
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
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
294f0f3991
CE backport of batch-comments-ee-store-module
2019-03-04 11:27:57 +00:00
edfdf568d3
Resolve "Add missing karma tests to the the MR Diff components"
2019-02-28 08:23:17 +00:00
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
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
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
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
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
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
a64bc0c1cd
Fixed diff rendering causing a duplicate key warning
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56797
2019-02-13 11:06:43 +00:00
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
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
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
e055f7d3ca
Merge branch 'diff-fix-folder-path-commas' into 'master'
...
Fixed diff tree folders being rendered incorrectly
See merge request gitlab-org/gitlab-ce!24635
2019-01-25 09:36:50 +00:00
f10d75ecf6
Fixed diff tree folders being rendered incorrectly
2019-01-24 16:14:14 +00:00
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
03df54b226
Trim first char of diff line text on diff discussions
...
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.
2019-01-22 17:00:16 +01:00
a0146dceb6
Resolve "Merge request file browser should always be possible show/hide"
2019-01-22 08:29:41 +00:00
75ead9a4f3
Merge branch 'diff-tree-collapse-directories' into 'master'
...
Collapses directory structure in merge request tree
Closes #53069
See merge request gitlab-org/gitlab-ce!24392
2019-01-18 11:19:32 +00:00
24b98a8793
Added specs for mutations & utils methods
2019-01-16 17:24:05 +00:00
7407dfdc20
Resolve "In Merge Request diff screen, master is not a hyperlink"
2019-01-16 13:18:10 +00:00
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
GitLab Bot
Illya Klymov
Samantha Ming
Paul Slaughter
André Luís
jboyson1
Natalia Tepluhina
Phil Hughes
Marcel van Remmerden
Ondřej Budai
Annabel Dunstone Gray
Paul Gascou-Vaillancourt
Fatih Acet
Sam Bigelow
Clement Ho
Douwe Maan
Winnie Hellmann
Denys Mishunov
Filipa Lacerda