summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs
Commit message (Collapse)AuthorAgeFilesLines
* Fix expansion of discussions in diffdiff-line-comment-vuejsDouwe Maan2016-08-182-4/+2
|
* Improve performance of MR show pageDouwe Maan2016-08-182-10/+16
|
* Merge branch '20454-edit-button-mr' into 'master' Douwe Maan2016-08-181-4/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit_blob_link can receive the blob to avoid access to the repository ## What does this MR do? Avoid access to the repository to get the blob when can be passed on context ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? #20454 to try to speed up the diff pages ## What are the relevant issue numbers? Relates #20454 probably we want and UI solution not just a backend solution ## 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 - [x] 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 !5850
| * edit_blob_link can receive the blob to avoid access to the repository20454-edit-button-mrPaco Guzman2016-08-181-4/+3
| |
* | Fix email line-height in Outlookoutlook-email-spacingSean McGivern2016-08-171-1/+6
|/ | | | | Outlook seems to handle `white-space: pre` weirdly, so just use `pre` elements (but only for emails!).
* Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_dataPaco Guzman2016-08-101-1/+1
|
* Merge branch 'side-by-side-unfold' into 'master' Douwe Maan2016-08-056-18/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unfold links for Side-by-Side view ## What does this MR do? Add unfold links for Side-by-Side view and refactor some diff related code ## What are the relevant issue numbers? Closes #3877 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] 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 !5415
| * Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-046-18/+11
| |
* | Fix Mystery GuestHerminio Torres2016-08-042-3/+3
|/ | | | | | Magic Variable - Change the name of the variable to assign the local variable for partial, rather than `i` use the `index`. Don't pass a local variable called `i` to a partial.
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-7/+7
| | | | So we have raw_diffs too
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-3/+4
| | | This object will manage Gitlab::Git::Compare instances
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-1/+1
| | | Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-033-5/+3
| | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* Avoid line_code and position calculation on line partial for plain view14202-avoid-line-code-position-calculationsPaco Guzman2016-08-011-4/+3
|
* Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-291-4/+5
| | | | | | | On a merge request with over 1000 changed files, there were redundant calls to blob_text_viewable?, which incurred about 7% of the time. Improves #14775
* Bump gitlab_git to speedup DiffCollection iterationsPaco Guzman2016-07-292-2/+2
|
* Fix expand all diffs button in compare view20241-expand-all-button-breaks-diff-comparison-viewSean McGivern2016-07-261-1/+1
| | | | | | | | We can't reuse the existing value of the format parameter, because on the merge request page that's 'json', so the link would go to a JSON file. We can't set it to HTML, because that adds '.html' the URL, which breaks the compare view (and looks bad). Setting it to nil uses the default format, which in all of these cases is HTML anyway.
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-203-31/+30
|
* Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-182-6/+6
|
* Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-114-28/+32
|\
| * Support renames in diff_for_path actionsSean McGivern2016-07-111-1/+1
| |
| * Make expand_all param more explicitSean McGivern2016-07-082-3/+3
| |
| * Allow expanding all diffs at onceSean McGivern2016-07-082-1/+3
| |
| * Ensure only renderable text diffs are collapsedSean McGivern2016-07-082-7/+6
| | | | | | | | | | Other diffs (those that are too large to render anyway, image diffs, diffs suppressed by .gitattributes) should be rendered immediately.
| * Disable overflow messagesSean McGivern2016-07-082-9/+1
| | | | | | | | | | With the option to expand and collapse individual diffs, these aren't needed any more.
| * Collapse large diffs by defaultSean McGivern2016-07-082-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 changesLuke "Jared" Bennett2016-07-081-2/+2
| |
* | Merge branch 'master' into faster-diffsDouwe Maan2016-07-077-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 partialsDouwe Maan2016-07-072-5/+5
| |
| * Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-061-1/+1
| |
| * Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-063-23/+19
| |
| * Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵Douwe Maan2016-07-061-0/+1
| | | | | | | | responsibility to other classes
| * Style diff and blob file headers the same wayDouwe Maan2016-07-062-30/+40
| |
| * Add DiffFile#blob and #old_blobDouwe Maan2016-07-062-5/+5
| |
| * Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-062-7/+6
| |
* | review changesLuke "Jared" Bennett2016-07-061-1/+1
| |
* | Simplify HAML code using unless condition and nestingPaco Guzman2016-07-063-11/+9
| | | | | | Extract diff line data attributes to helper methods
* | Moving up common html data attributesPaco Guzman2016-07-063-6/+7
| |
* | Diffs will create button/diff form on demand no on server sideJacob Schatz2016-07-064-26/+21
|/
* Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' Jacob Schatz2016-06-151-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) ![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
| * added whitespace toggle to diffs page and set it to return the project ↵Luke "Jared" Bennett2016-06-101-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 Hu2016-06-122-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 Maan2016-05-201-4/+2
|\ | | | | | | | | # Conflicts: # app/services/system_note_service.rb
| * Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-4/+2
| | | | | | | | Gitlab::Diff::InlineDiff
* | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-171-1/+1
|/ | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-133-5/+5
|
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-132-10/+9
|
* Support supressing text file diffs on the default branch with .gitattributesMatt Oakes2016-04-291-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 mobileAlfredo Sumaran2016-04-261-2/+2
|
* Update syntaxAlfredo Sumaran2016-04-261-2/+2
|
View Lorry Controller Status