gitlabhq

mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00

Files

T

Jacob Schatz 5d16d50ceb Merge branch 'toggle-whitespace-button-for-compare-page' into 'master'

Toggle whitespace button for compare page

## What does this MR do?

Adds whitespace button to compare branches page.

## Are there points in the code the reviewer needs to double check?

Ruby code.

## Why was this MR needed?

Compare branches UX

## What are the relevant issue numbers?

Closes #17881.

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_18.39.48](/uploads/8995a7bc8bea7fa3ff19446ebe49fb88/Screen_Shot_2016-06-09_at_18.39.48.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4569

2016-06-15 22:48:39 +00:00

_diffs.html.haml

Merge branch 'toggle-whitespace-button-for-compare-page' into 'master'

2016-06-15 22:48:39 +00:00

_file.html.haml

Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark

2016-06-12 07:36:25 -07:00

_image.html.haml

Fix creation of merge requests for orphaned branches

2016-04-04 04:51:05 -07:00

_line.html.haml

Use @diff_notes_disabled instead of @comments_allowed