diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-13 12:05:09 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-13 12:05:09 +0000 |
| commit | f4dde5d564c76f8a6172b5b9d5f739b501f49a45 (patch) | |
| tree | 29e8e1c4b10f6f903d6d839c3729ea0763ae1f01 /changelogs | |
| parent | 0b451ffc730f1a303f6bf86b7b54e33720217b76 (diff) | |
| parent | c3415873b969ab3a8708da1f35388aa4f2e4155a (diff) | |
| download | gitlab-ce-f4dde5d564c76f8a6172b5b9d5f739b501f49a45.tar.gz | |
Merge branch '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image' into 'master'
Add image controls to MR diffs
## What does this MR do?
Instantiates `ImageFile` in `Diff` which is instantiated in `MergeRequestTabs`.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24949
See merge request !7919
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image.yml b/changelogs/unreleased/24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image.yml new file mode 100644 index 00000000000..b8ba9391530 --- /dev/null +++ b/changelogs/unreleased/24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image.yml @@ -0,0 +1,4 @@ +--- +title: Add image controls to MR diffs +merge_request: 7919 +author: |