Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
AgeCommit message (Collapse)Author
2020-11-19Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-11-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-11-13Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-11-12Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-09-07Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-07-12Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-07-02Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2020-01-29Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-12-17Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-11-29Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-10-10Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-10-08Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2019-09-18Add latest changes from gitlab-org/gitlab@masterGitLab Bot
2018-12-27Fixing image lfs bug and also displaying text lfsFrancisco Javier López
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.
2018-09-11Disable existing offenses for the CodeReuse copsYorick Peterse
This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-07Enable frozen string for app/helpers/**/*.rbgfyoung
Partially addresses #47424.
2018-04-08[Rails5] Add `safe_params` helperblackst0ne
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
2018-02-13Render modified icon for moved fileFilipa Lacerda
2018-01-09Fix changes dropdown ellipsis working across browsersPhil Hughes
Closes #41561
2017-12-12Use app host instead of asset host when rendering image blob or diffDouwe Maan
2017-11-20Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable
Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
2017-11-17updated to use new sprite iconsPhil Hughes
2017-11-16Adds Rubocop rule for line break after guard clauseJacopo
Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
2017-10-02Only copy old/new code when selecting left/right side of parallel diffDouwe Maan
2017-08-07Merge branch 'master' into ideMike Greiling
* 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 ...
2017-08-03Moved changed files into a dropdownPhil Hughes
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
2017-07-31Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-28Fix diff commenting results just after changing viewSean McGivern
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.
2017-07-20Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-05Create and use project path helpers that only need a project, no namespaceDouwe Maan
2017-06-22Merge remote-tracking branch 'origin/master' into dm-tree-jsonDmitriy Zaporozhets
2017-06-19Don't display comment on unchanged line on both sides in parallel diffDouwe Maan
2017-06-14Implement diff viewersDouwe Maan
2017-06-01Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern
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
2017-05-31Fix: A diff comment on a change at last line of a file shows as two comments ↵Valery Sizov
in discussion
2017-05-30Consistent diff and blob size limit namesDouwe Maan
2017-05-26Add experimental JSON format for tree controllerDouwe Maan
2017-05-23Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan
2017-05-23Clean up diff renderingDouwe Maan
2017-05-23Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan
2017-05-12Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan
2017-05-10Enable the Style/TrailingCommaInLiteral copRémy Coutable
Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-10Fix specsDouwe Maan
2017-04-05Correctly display multiple separate discussions on the same diff lineDouwe Maan
2017-01-12Show 'too many changes' message for merge requestFelipe Artur
2016-12-09Merge branch 'html-safe-diff-line-content' into 'security' Robert Speicher
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
2016-11-04Remove an extra leading space from diff contentHiroyuki Sato
2016-08-10Avoid commit lookup on diff_helperPaco Guzman
2016-08-04Add unfold links for Side-by-Side viewTim Masliuchenko
2016-08-03switch from diff_file_collection to diffsPaco Guzman
So we have raw_diffs too
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-08 12:09:37 +0300