root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
102,860 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

187 Commits

Author SHA1 Message Date
GitLab Bot 6755df108b Add latest changes from gitlab-org/gitlab@master 2020-01-21 00:08:46 +00:00
GitLab Bot 4998f4e2d8 Add latest changes from gitlab-org/gitlab@master 2020-01-15 03:08:55 +00:00
GitLab Bot 0b12a5312c Add latest changes from gitlab-org/gitlab@master 2020-01-14 21:07:45 +00:00
GitLab Bot 4ce0bee95d Add latest changes from gitlab-org/gitlab@master 2020-01-14 12:07:41 +00:00
GitLab Bot 0ba3a054d2 Add latest changes from gitlab-org/gitlab@master 2020-01-10 09:07:49 +00:00
GitLab Bot b085478c4c Add latest changes from gitlab-org/gitlab@master 2020-01-01 06:09:01 +00:00
GitLab Bot 8b61452138 Add latest changes from gitlab-org/gitlab@master 2019-12-20 15:07:34 +00:00
GitLab Bot e3764d340e Add latest changes from gitlab-org/gitlab@master 2019-12-19 12:07:35 +00:00
GitLab Bot e723867717 Add latest changes from gitlab-org/gitlab@master 2019-12-17 18:07:48 +00:00
GitLab Bot 47b8f79a08 Add latest changes from gitlab-org/gitlab@master 2019-12-13 00:08:05 +00:00
GitLab Bot 784fae4b9d Add latest changes from gitlab-org/gitlab@master 2019-12-12 12:07:33 +00:00
GitLab Bot fc53ce8e6c Add latest changes from gitlab-org/gitlab@master 2019-12-12 09:07:48 +00:00
GitLab Bot 93c6764dac Add latest changes from gitlab-org/gitlab@master 2019-12-09 12:07:58 +00:00
GitLab Bot b41cd8cb92 Add latest changes from gitlab-org/gitlab@master 2019-12-04 18:08:46 +00:00
GitLab Bot 2c0b1b6259 Add latest changes from gitlab-org/gitlab@master 2019-11-28 00:06:07 +00:00
GitLab Bot bd8a202da6 Add latest changes from gitlab-org/gitlab@master 2019-11-27 00:06:23 +00:00
GitLab Bot 23d237110e Add latest changes from gitlab-org/gitlab@master 2019-11-26 09:08:36 +00:00
GitLab Bot cb3e6b9c1b Add latest changes from gitlab-org/gitlab@master 2019-10-29 18:06:15 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Illya Klymov 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
Samantha Ming 261f4fe7ac Fix to show renamed file in mr 2019-08-21 08:23:22 +00:00
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
jboyson1 d90865a960 Backport from EE 2019-08-01 16:00:36 -05: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
Ondřej Budai 7aac4e5c3f Fix whitespace changes visibility when the related file was initially collapsed 2019-06-05 07:27:08 +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 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
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
Douwe Maan 40e3f207cb
Remove now-unnecessary noteable_line class 2019-03-26 14:37:14 +01: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