summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-2/+5
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-291-0/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-161-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-291-6/+12
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-101-2/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-081-3/+8
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-181-2/+0
|
* Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-271-24/+0
| | | | | | | | | | | This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812, fixes a problem creating a displaying image diff notes when the image is stored in LFS. The main problem was that `Gitlab::Diff::File` was returning an invalid valid in `text?` for this kind of files. It also fixes a rendering problem with other LFS files, like text ones. They LFS pointer shouldn't be shown when LFS is enabled for the project, but they were.
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-0/+2
| | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* Enable frozen string for app/helpers/**/*.rbgfyoung2018-09-061-5/+6
| | | | Partially addresses #47424.
* [Rails5] Add `safe_params` helperblackst0ne2018-04-081-1/+1
| | | | | | | | | | Rails 5.0 requires to explicitly permit attributes when building a URL using current `params` object. The `safe_params` helper allows developers to just call `safe_params.merge(...)` instead of manually adding `permit` to every call. https://github.com/rails/rails/pull/20868
* Render modified icon for moved file42314-diff-fileFilipa Lacerda2018-02-131-1/+1
|
* Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsisPhil Hughes2018-01-091-0/+8
| | | | Closes #41561
* Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-urlDouwe Maan2017-12-121-4/+12
|
* Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-201-0/+1
|\ | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
| * Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+1
| | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* | updated to use new sprite iconsPhil Hughes2017-11-171-3/+3
|/
* Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-021-7/+9
|
* Merge branch 'master' into ideMike Greiling2017-08-071-0/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| * Moved changed files into a dropdownPhil Hughes2017-08-031-0/+18
| | | | | | | | | | | | | | | | | | | | | | This makes navigating through diff files quickly. Currently we just toggle a list, which could be pretty big. This moves it into a dropdown to make it much easier. Also includes a filter bar to quickly search for certain files/extensions. Closes #29778
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-311-1/+1
|\ \ | |/
| * Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inlineSean McGivern2017-07-281-1/+1
| | | | | | | | | | | | | | | | | | When you change the diff view (inline / side-by-side), we set a cookie based on that new view. When you add a comment, we choose the style to use in the response based on that cookie. However, when you have just changed diff style, the request cookie will contain the old value, so we should use the view param instead.
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-201-7/+7
|\ \ | |/
| * Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-7/+7
| |
* | Merge remote-tracking branch 'origin/master' into dm-tree-jsonDmitriy Zaporozhets2017-06-221-6/+30
|\ \ | |/
| * Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-191-2/+2
| |
| * Implement diff viewersDouwe Maan2017-06-141-0/+24
| |
| * Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-011-2/+2
| |\ | | | | | | | | | | | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802
| | * Fix: A diff comment on a change at last line of a file shows as two comments ↵Valery Sizov2017-05-311-2/+2
| | | | | | | | | | | | in discussion
| * | Consistent diff and blob size limit namesDouwe Maan2017-05-291-4/+4
| |/
* | Add experimental JSON format for tree controllerDouwe Maan2017-05-261-4/+4
|/
* Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-231-20/+4
|
* Clean up diff renderingDouwe Maan2017-05-231-4/+20
|
* Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-231-2/+2
|
* Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-121-2/+2
|
* Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
| | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* 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
|
View Lorry Controller Status