Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-12-13 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-12-11 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-12-10 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-12-09 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-12-06 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-12-04 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-11-29 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-11-26 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-10-16 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-10-10 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-10-10 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-09-26 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-09-23 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-09-18 | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | |
2019-09-02 | Fixing #65389 | Massimeddu Cireddu | |
Wrong format on MS Teams integration push events with multi line commit messages | |||
2019-07-05 | Refactor PositionTracer to support different types | Patrick Bajao | |
This is to prepare for supporing image type position tracing | |||
2019-07-01 | Don't show image diff note on text file | Patrick Bajao | |
2019-06-14 | Expose comments on Noteables in GraphQL | Bob Van Landuyt | |
This exposes `Note`s on Issues & MergeRequests using a `Types::Notes::NoteableType` in GraphQL. Exposing notes on a new type can be done by implementing the `NoteableType` interface on the type. The presented object should be a `Noteable`. | |||
2019-06-06 | Extend #parse to accept a suggestions_filter_enabled param | Kerri Miller | |
This will allow the front end to specify the behavior as needed. | |||
2019-05-28 | Fix removing empty lines via suggestions | Igor | |
Before this fix, a suggestion which just removes an empty line wasn't appliable | |||
2019-03-28 | Memoize old_blob and new_blob to improve performance | Igor | |
2019-03-27 | Prepare suggestion implementation for multi-line | Oswaldo Ferreira | |
Adds the groundwork needed in order to persist multi-line suggestions, while providing the parsing strategy which will be reused for the **Preview** as well. | |||
2019-03-21 | Merge branch '59147-duplicate-match-line' into 'master' | Douwe Maan | |
Fix duplicated bottom match line Closes #59147 See merge request gitlab-org/gitlab-ce!26402 | |||
2019-03-21 | Fix diff bottom expand button appears twice | Mark Chao | |
This is a quick fix by only append match line once when calling diff_lines_for_serializer multiple time. Also enable feature by default | |||
2019-03-20 | Implement multi-line suggestions filtering | Oswaldo Ferreira | |
Implements the filtering logic for `suggestion:-x+y` syntax. | |||
2019-03-18 | Implement suggestion diff lines parser | Oswaldo Ferreira | |
2019-03-07 | Merge branch 'expand-diff-to-full-file' into 'master' | Douwe Maan | |
Expand diff to entire file Closes #19054 See merge request gitlab-org/gitlab-ce!24406 | |||
2019-03-06 | Adds the Rubocop ReturnNil cop | Andrew Newdigate | |
This style change enforces `return if ...` instead of `return nil if ...` to save maintainers a few minor review points | |||
2019-03-06 | Add option to expand diff to full file | Phil Hughes | |
The user can also toggle between the diff changes and the full file diff. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054 | |||
2019-02-15 | Replaced part of diff file properties with diff viewer | Natalia Tepluhina | |
- replaced file.too_large - replaced file.text - replaced file.collapsed | |||
2019-01-08 | Adjusts duplicated line when commenting on unfolded diff lines | Oswaldo Ferreira | |
2018-12-27 | Fixing image lfs bug and also displaying text lfs | Francisco 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-12-21 | Cache diff highlight in discussions | Oswaldo Ferreira | |
This commit handles note diffs caching, which considerably improves the performance on merge requests with lots of comments. Important to note that the caching approach taken here is different from `Gitlab::Diff::HighlightCache`. We do not reset the whole cache when a new push is sent or anything else. That's because discussions diffs are persisted and do not change. | |||
2018-12-15 | Merge branch '54786-mr-empty-file-display' into 'master' | Nick Thomas | |
Display empty files properly on MR diffs Closes #54786 See merge request gitlab-org/gitlab-ce!23671 | |||
2018-12-13 | Allow suggesting single line changes in diffs | Oswaldo Ferreira | |
2018-12-12 | Display empty files properly on MR diffs | Sean Nichols | |
2018-12-04 | Avoid 500's when serializing legacy diff notes | Oswaldo Ferreira | |
2018-11-26 | Treat Repository instances with the same disk path as the same hash key | Douwe Maan | |
2018-11-12 | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master' | Douwe Maan | |
Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914 | |||
2018-11-09 | Comment on any expanded diff line on MRs | Oswaldo Ferreira | |
2018-11-08 | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'" | Oswaldo Ferreira | |
This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e. | |||
2018-11-07 | Merge branch 'osw-comment-on-any-line-on-diffs' into 'master' | Douwe Maan | |
Comment on any expanded diff line on MRs See merge request gitlab-org/gitlab-ce!22398 | |||
2018-11-07 | Enable even more frozen string in lib/gitlab | gfyoung | |
Enables frozens string for the following: * lib/gitlab/conflict/**/*.rb * lib/gitlab/cross_project_access/**/*.rb * lib/gitlab/cycle_analytics/**/*.rb * lib/gitlab/data_builder/**/*.rb * lib/gitlab/database/**/*.rb * lib/gitlab/dependency_linker/**/*.rb * lib/gitlab/diff/**/*.rb * lib/gitlab/downtime_check/**/*.rb * lib/gitlab/email/**/*.rb * lib/gitlab/etag_caching/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424. | |||
2018-11-06 | Apply additional guard-clauses for unfold_required? | Oswaldo Ferreira | |
2018-11-06 | Comment on any expanded diff line on MRs | Oswaldo Ferreira | |
2018-11-02 | Merge branch 'sh-optimize-reload-diffs-service' into 'master' | Sean McGivern | |
Significantly cut memory and SQL queries when reloading diffs See merge request gitlab-org/gitlab-ce!22725 | |||
2018-11-01 | Avoidp loading merge request diff files when not needed | Stan Hu | |
2018-11-01 | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master' | Achilleas Pipinellis | |
Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683 | |||
2018-11-01 | Fix typos in comments and specs | George Tsiolis | |
2018-10-30 | Make Highlight accept language param | Mark Chao | |
This replaces the repository param. This allows more flexiblity as sometimes we have highlight content not related to repository. Sometimes we know ahead of time the language of the content. Lastly language determination seems better fit as a logic in the Blob class. `repository` param is only used to determine the language, which seems to be the responsiblity of Blob. |