Commit Graph

60 Commits

Author SHA1 Message Date
GitLab Bot a865379008 Add latest changes from gitlab-org/gitlab@master 2020-09-07 12:08:27 +00:00
GitLab Bot a928c5170f Add latest changes from gitlab-org/gitlab@master 2020-09-01 09:10:28 +00:00
GitLab Bot 2c49951e8c Add latest changes from gitlab-org/gitlab@master 2020-08-26 09:10:16 +00:00
GitLab Bot 27622f7417 Add latest changes from gitlab-org/gitlab@master 2020-08-24 15:10:11 +00:00
GitLab Bot 7d5d23819b Add latest changes from gitlab-org/gitlab@master 2020-07-15 06:09:35 +00:00
GitLab Bot 83fc2f3dc8 Add latest changes from gitlab-org/gitlab@master 2020-07-08 21:09:09 +00:00
GitLab Bot c59765a50a Add latest changes from gitlab-org/gitlab@master 2020-06-24 18:09:03 +00:00
GitLab Bot 6046a605fd Add latest changes from gitlab-org/gitlab@master 2020-06-22 12:08:47 +00:00
GitLab Bot f1d9023a90 Add latest changes from gitlab-org/gitlab@master 2020-04-21 18:09:31 +00:00
GitLab Bot 04baa85554 Add latest changes from gitlab-org/gitlab@master 2020-04-03 09:09:31 +00:00
GitLab Bot b11f7057d0 Add latest changes from gitlab-org/gitlab@master 2020-04-01 09:07:45 +00:00
GitLab Bot c4db541c1b Add latest changes from gitlab-org/gitlab@master 2020-03-24 21:07:54 +00:00
GitLab Bot 967812838c Add latest changes from gitlab-org/gitlab@master 2020-03-23 18:09:25 +00:00
GitLab Bot 38149afcf9 Add latest changes from gitlab-org/gitlab@master 2020-02-24 09:08:51 +00:00
GitLab Bot a89cb5cbdd Add latest changes from gitlab-org/gitlab@master 2020-02-06 21:08:48 +00:00
GitLab Bot 26384c9a61 Add latest changes from gitlab-org/gitlab@master 2020-02-05 09:08:43 +00:00
GitLab Bot f47c768fad Add latest changes from gitlab-org/gitlab@master 2020-01-23 09:09:07 +00:00
GitLab Bot 36e363d33d Add latest changes from gitlab-org/gitlab@master 2020-01-21 21:08:54 +00:00
GitLab Bot c158fa8d69 Add latest changes from gitlab-org/gitlab@master 2020-01-16 12:08:32 +00:00
GitLab Bot e3764d340e Add latest changes from gitlab-org/gitlab@master 2019-12-19 12:07:35 +00:00
GitLab Bot cfc792b9ca Add latest changes from gitlab-org/gitlab@master 2019-12-10 07:53:40 +00:00
GitLab Bot 93c6764dac Add latest changes from gitlab-org/gitlab@master 2019-12-09 12:07:58 +00:00
GitLab Bot 0a850868df Add latest changes from gitlab-org/gitlab@master 2019-10-09 12:06:13 +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
Tomislav Nikic 972573e351 Adding changes to CE from EE
All the changes done to files that are also inside CE and need to be
ported.
2019-07-27 04:23:34 +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
Justin Boyson 3c6dc87ea8 Make tooltips consistently render on top
On edit-button simply set position to top.
Made this change directly in template since edit-button
is only used in one place.

Had to wrap the comments toggle button in span tag to make
tooltip show even when disabled as per bootstrap-vue docs.
https://bootstrap-vue.js.org/docs/components/tooltip#overview

Note: Also changexc button to gl-buttonto be consistent
with rest of file.
2019-06-01 02:12:45 +00:00
Marcel van Remmerden f88ffe414e Get copy to clipboard button aligned within snippet header 2019-05-30 12:54:12 +00:00
Tim Zallmann f5f7c0f038 Merge branch '59034-external-link-button' into 'master'
Replaced "View file" button with doc-text icon

Closes #59034

See merge request gitlab-org/gitlab-ce!27365
2019-04-16 15:18:31 +00:00
Fatih Acet a1179e5e60
Fix showing HTML content in view file tooltip 2019-04-16 00:28:20 +02:00
Denys Mishunov 3b6dcb8d81 Replaced external link button with doc-text icon
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59034
2019-04-15 10:54:54 +02: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
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
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
Natalia Tepluhina edfdf568d3 Resolve "Add missing karma tests to the the MR Diff components" 2019-02-28 08:23:17 +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
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
Mike Greiling 7ccd235df1
Upgrade prettier and reformat files as necessary
Upgrades prettier to 1.15.3
Runs `yarn prettier-save-all` against the codebase
Most changes are due to https://github.com/prettier/prettier/pull/5519
2019-01-14 15:29:02 -06: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
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 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
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
Jacques Erasmus a577cfcbb2 Fix broken file name navigation on MRs 2018-10-11 22:32:28 +00:00
Fatih Acet 8aedb71c49
Fix showing diff file header for renamed files 2018-10-03 21:37:54 +02:00
Mike Greiling f829b181bc
Resolve eslint-plugin-vue errors
The eslint-plugin-vue upgrade had some breaking changes to
vue/attribute-order which needed to be resolved in order to avoid
disabling the rule entirely
2018-09-20 02:39:50 -05:00