summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Fix specsDouwe Maan2017-04-091-0/+2
|
* Correctly display multiple separate discussions on the same diff lineDouwe Maan2017-04-051-4/+4
|
* Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-121-0/+6
|
* Merge branch 'html-safe-diff-line-content' into 'security' Robert Speicher2016-12-081-1/+3
| | | | | | | | | | Don't accidentally mark unsafe diff lines as HTML safe Fixes potential XSS issue when a legacy diff note is created on a merge request whose diff contained HTML See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249 See merge request !2040
* Remove an extra leading space from diff contentHiroyuki Sato2016-11-041-4/+3
|
* Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_dataPaco Guzman2016-08-101-3/+2
|
* Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-14/+25
|
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-4/+1
| | | | So we have raw_diffs too
* 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-031-6/+5
| | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-291-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop cops that check access modifiers ## What does this MR do? This MR enables Rubocop cops that detect methods that should be restricted but are the part of public API because of access modifiers used improperly. This also fixes existing offenses. ## Why was this MR needed? Some method in our codebase are public instead of being private because it is sometimes difficult to get it right without static analysis. ## What are the relevant issue numbers? See #17478 Closes #17372 See merge request !5014
| * Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-191-2/+0
| |
* | Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-7/+9
|/
* Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-4/+5
|
* Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-111-9/+11
|\
| * Support renames in diff_for_path actionsSean McGivern2016-07-111-2/+6
| |
| * Make expand_all param more explicitSean McGivern2016-07-081-2/+2
| |
| * DRY up diff_for_path actionsSean McGivern2016-07-081-21/+3
| | | | | | | | | | | | 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
| * Allow expanding all diffs at onceSean McGivern2016-07-081-0/+4
| |
| * Ensure only renderable text diffs are collapsedSean McGivern2016-07-081-0/+1
| | | | | | | | | | 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-081-9/+1
| | | | | | | | | | With the option to expand and collapse individual diffs, these aren't needed any more.
| * Collapse large diffs by defaultSean McGivern2016-07-081-0/+19
| | | | | | | | | | When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
* | Merge branch 'master' into faster-diffsDouwe Maan2016-07-071-8/+7
|\ \ | |/ | | | | | | | | | | | | | | # 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
| * Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-061-1/+3
| |
| * Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵Douwe Maan2016-07-061-4/+0
| | | | | | | | responsibility to other classes
| * Add DiffFile#blob and #old_blobDouwe Maan2016-07-061-2/+3
| |
| * Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-2/+2
| |
* | fix up testsLuke "Jared" Bennett2016-07-061-1/+1
|/ | | | | | Added more exceptions Added handling inline view type
* added whitespace toggle to diffs page and set it to return the project ↵Luke "Jared" Bennett2016-06-101-0/+5
| | | | | | | | compare path with the selected whitespace params Updated CHANGELOG Moved CHANGELOG entry
* Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-2/+2
| | | | See #17478
* Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-2/+2
| | | | Gitlab::Diff::InlineDiff
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-13/+9
|
* Allow to pass custom classes to buttonAlfredo Sumaran2016-04-261-6/+9
|
* Hide button on mobileAlfredo Sumaran2016-04-261-1/+1
|
* Syntax and code improvementsAlfredo Sumaran2016-04-261-11/+13
|
* Rename methodAlfredo Sumaran2016-04-261-4/+4
|
* Use new method hide_whitespaces?Alfredo Sumaran2016-04-261-1/+1
|
* Add Hide/show whitespace changes button on diff and commit viewAlfredo Sumaran2016-04-261-0/+22
|
* Always read diff_view setting from the cookieRobert Speicher2016-04-141-1/+7
| | | | | | | | | | | | | | Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
* Syntax & style updates14176-diff-paste-dataAnnabel Dunstone2016-04-141-3/+1
|
* Add line type conditional to diff line helperAnnabel Dunstone2016-04-141-2/+4
|
* Copying and pasting doesn't grab line numbers or +/-Annabel Dunstone2016-04-141-0/+1
|
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-27/+7
|
* Fixes syntax errorAlfredo Sumaran2016-02-191-1/+1
|
* Make diff view name getter less error proneAlfredo Sumaran2016-02-191-1/+1
|
* Sort line notes used in parallel diff by created_atRémy Coutable2016-02-171-1/+1
| | | | Fixes #13464.
* Fewer html_safesrename-inline-diffDouwe Maan2016-01-301-2/+2
|
* Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-291-1/+10
|
* Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-201-2/+1
|
* Restore helperDouwe Maan2016-01-201-0/+4
|
View Lorry Controller Status