delta/gitlab/gitlab-ce.git/app/views/projects/diffs, branch commit-header

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

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


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

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

2016-06-12T14:36:25+00:00

Here was the problem:

1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file.
2. If the blob is text, GitLab will attempt to display it.
3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters.
4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT.

To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires
an update to gitlab_git: gitlab-org/gitlab_git!86

Closes #13826

added whitespace toggle to diffs page and set it to return the project compare path with the selected whitespace params

2016-06-10T16:31:28+00:00

Updated CHANGELOG

Moved CHANGELOG entry

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-20T21:23:04+00:00

# Conflicts:
#	app/services/system_note_service.rb

Create DiffFilter and change SystemNoteService#change_title to use Gitlab::Diff::InlineDiff

2016-05-18T16:15:10+00:00

Syntax-highlight diffs in push emails

2016-05-17T12:23:17+00:00

Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

Use `@diff_notes_disabled` instead of `@comments_allowed`

2016-05-13T22:31:58+00:00

Extract LegacyDiffNote out of Note

2016-05-13T22:31:43+00:00

Support supressing text file diffs on the default branch with .gitattributes

2016-04-29T11:45:15+00:00

This is a combination of 3 commits.

- Update the bare repositories info/attributes if the default branch is updated
- Check the diff attributes of a file before showing a diff
- Update CHANGELOG

Hide button on mobile

2016-04-26T19:01:40+00:00