| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Make expand_all param more explicit | Sean McGivern | 2016-07-08 | 2 | -3/+3 | |
| | | | ||||||
| | * | Allow expanding all diffs at once | Sean McGivern | 2016-07-08 | 2 | -1/+3 | |
| | | | ||||||
| | * | Ensure only renderable text diffs are collapsed | Sean McGivern | 2016-07-08 | 2 | -7/+6 | |
| | | | | | | | | | | | Other diffs (those that are too large to render anyway, image diffs, diffs suppressed by .gitattributes) should be rendered immediately. | |||||
| | * | Disable overflow messages | Sean McGivern | 2016-07-08 | 2 | -9/+1 | |
| | | | | | | | | | | | With the option to expand and collapse individual diffs, these aren't needed any more. | |||||
| | * | Collapse large diffs by default | Sean McGivern | 2016-07-08 | 2 | -25/+31 | |
| | | | | | | | | | | | When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead. | |||||
| * | | Registered FilesCommentButton as a jQuery plugin and made review changes | Luke "Jared" Bennett | 2016-07-08 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into faster-diffs | Douwe Maan | 2016-07-07 | 7 | -68/+72 | |
| |\ \ | |/ | | | | | | | | | | | | | | | # Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb | |||||
| | * | Use HAML class syntax in diff line partials | Douwe Maan | 2016-07-07 | 2 | -5/+5 | |
| | | | ||||||
| | * | Remove duplication, unused methods, and some other style things | Douwe Maan | 2016-07-06 | 1 | -1/+1 | |
| | | | ||||||
| | * | Display new diff notes and allow creation through the web interface | Douwe Maan | 2016-07-06 | 3 | -23/+19 | |
| | | | ||||||
| | * | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵ | Douwe Maan | 2016-07-06 | 1 | -0/+1 | |
| | | | | | | | | | responsibility to other classes | |||||
| | * | Style diff and blob file headers the same way | Douwe Maan | 2016-07-06 | 2 | -30/+40 | |
| | | | ||||||
| | * | Add DiffFile#blob and #old_blob | Douwe Maan | 2016-07-06 | 2 | -5/+5 | |
| | | | ||||||
| | * | Represent DiffRefs as proper class instead of tuple array | Douwe Maan | 2016-07-06 | 2 | -7/+6 | |
| | | | ||||||
| * | | review changes | Luke "Jared" Bennett | 2016-07-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Simplify HAML code using unless condition and nesting | Paco Guzman | 2016-07-06 | 3 | -11/+9 | |
| | | | | | | | Extract diff line data attributes to helper methods | |||||
| * | | Moving up common html data attributes | Paco Guzman | 2016-07-06 | 3 | -6/+7 | |
| | | | ||||||
| * | | Diffs will create button/diff form on demand no on server side | Jacob Schatz | 2016-07-06 | 4 | -26/+21 | |
| |/ | ||||||
| * | Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' | Jacob Schatz | 2016-06-15 | 1 | -0/+2 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)  ## 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 | |||||
| | * | added whitespace toggle to diffs page and set it to return the project ↵ | Luke "Jared" Bennett | 2016-06-10 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | compare path with the selected whitespace params Updated CHANGELOG Moved CHANGELOG entry | |||||
| * | | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ↵ | Stan Hu | 2016-06-12 | 2 | -0/+3 | |
| |/ | | | | | | | | | | | | | | | | mark 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 | |||||
| * | Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' | Douwe Maan | 2016-05-20 | 1 | -4/+2 | |
| |\ | | | | | | | | | # Conflicts: # app/services/system_note_service.rb | |||||
| | * | Create DiffFilter and change SystemNoteService#change_title to use ↵ | Adam Butler | 2016-05-18 | 1 | -4/+2 | |
| | | | | | | | | | Gitlab::Diff::InlineDiff | |||||
| * | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting | Sean McGivern | 2016-05-17 | 1 | -1/+1 | |
| |/ | | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 | |||||
| * | Use `@diff_notes_disabled` instead of `@comments_allowed` | Douwe Maan | 2016-05-13 | 3 | -5/+5 | |
| | | ||||||
| * | Extract LegacyDiffNote out of Note | Douwe Maan | 2016-05-13 | 2 | -10/+9 | |
| | | ||||||
| * | Support supressing text file diffs on the default branch with .gitattributes | Matt Oakes | 2016-04-29 | 1 | -13/+13 | |
| | | | | | | | | | 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 | Alfredo Sumaran | 2016-04-26 | 1 | -2/+2 | |
| | | ||||||
| * | Update syntax | Alfredo Sumaran | 2016-04-26 | 1 | -2/+2 | |
| | | ||||||
| * | Hide whitespace toggle button for new merge requests | Alfredo Sumaran | 2016-04-26 | 1 | -4/+6 | |
| | | ||||||
| * | Add Hide/show whitespace changes button on diff and commit view | Alfredo Sumaran | 2016-04-26 | 1 | -0/+4 | |
| | | ||||||
| * | Syntax & style updates14176-diff-paste-data | Annabel Dunstone | 2016-04-14 | 1 | -8/+8 | |
| | | ||||||
| * | Add line type conditional to diff line helper | Annabel Dunstone | 2016-04-14 | 1 | -1/+1 | |
| | | ||||||
| * | Copying and pasting doesn't grab line numbers or +/- | Annabel Dunstone | 2016-04-14 | 1 | -3/+3 | |
| | | ||||||
| * | Diff viewer links to correct part of the file | Phil Hughes | 2016-04-14 | 1 | -4/+4 | |
| | | | | | | | Added highlight colours to diff rows Closes #13852 | |||||
| * | Diff touch ups | Annabel Dunstone | 2016-04-07 | 1 | -1/+1 | |
| | | ||||||
| * | Diff design updates | Annabel Dunstone | 2016-04-07 | 1 | -5/+5 | |
| | | ||||||
| * | Update diff colors and icons | Annabel Dunstone | 2016-04-07 | 1 | -1/+1 | |
| | | ||||||
| * | Fix creation of merge requests for orphaned branches | Stan Hu | 2016-04-04 | 1 | -2/+5 | |
| | | | | | Closes #14875 | |||||
| * | Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' | Jacob Schatz | 2016-03-21 | 1 | -1/+1 | |
| |\ | | | | | | | | | | | | | change the css class has_tooltip to has-tooltip universally closes #14432 See merge request !3321 | |||||
| | * | change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltip | Arinde Eniola | 2016-03-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'backport-ee-premailer' into 'master' | Rémy Coutable | 2016-03-21 | 2 | -19/+28 | |
| |\ \ | |/ |/| | | | | | | | | | Backport premailer and diff changes from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !3318 | |||||
| | * | Move diff line to separate partialbackport-ee-premailer | Douwe Maan | 2016-03-19 | 2 | -19/+28 | |
| | | | ||||||
| * | | Fix bug where wrong commit ID was being used in a merge request diff to show ↵ | Stan Hu | 2016-03-19 | 3 | -4/+5 | |
| |/ | | | | | | | | old image Closes #3769 Closes #14327 | |||||
| * | Show a notice for diffs that are too largehide-large-diffs | Yorick Peterse | 2016-03-18 | 1 | -9/+13 | |
| | | | | | | | | This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster. | |||||
| * | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 3 | -11/+4 | |
| | | ||||||
| * | Changed too many changes buttons to whitetoo-many-changes-btns | Phil Hughes | 2016-02-29 | 1 | -6/+5 | |
| | | | | | Closes #13751 | |||||
| * | Emoji reponses on diffs aren't award emoji | Zeger-Jan van de Weg | 2016-02-19 | 1 | -2/+2 | |
| | | ||||||
| * | Fixes requested by Rémyimage-diff | Jacob Vosmaer | 2016-02-17 | 1 | -1/+1 | |
| | | ||||||
| * | Use /raw/ requests for image diffs | Jacob Vosmaer | 2016-02-16 | 1 | -9/+9 | |
| | | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |