| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [skip ci] Replace hidden-xs | Clement Ho | 2018-04-09 | 1 | -1/+1 |
| | | |||||
| * | refactor code based on feedback | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | | |||||
| * | some initial refactoring | James Lopez | 2018-02-23 | 1 | -1/+1 |
| | | |||||
| * | Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-error | Eric Eastwood | 2018-01-09 | 1 | -1/+1 |
| | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491 | ||||
| * | Add view replaced file link for image diffsadd-view-replaced-file-link | Clement Ho | 2017-09-20 | 1 | -0/+6 |
| | | |||||
| * | Pass fallback_diff_refs to Diff::File instead of using view helpers | Douwe Maan | 2017-05-23 | 1 | -7/+6 |
| | | |||||
| * | Clean up diff rendering | Douwe Maan | 2017-05-23 | 1 | -4/+7 |
| | | |||||
| * | Use Blob methods instead of BlobHelper helpers | Douwe Maan | 2017-04-27 | 1 | -1/+1 |
| | | |||||
| * | Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needs | Eric Eastwood | 2017-04-24 | 1 | -0/+2 |
| | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276 | ||||
| * | Align file header items while keeping collapse functionality | Annabel Dunstone Gray | 2017-02-08 | 1 | -1/+2 |
| | | |||||
| * | Use a new class to keep old behavior | Filipa Lacerda | 2017-02-08 | 1 | -1/+1 |
| | | |||||
| * | Revert "Merge branch 'revert-a91ff32b' into 'master'" | Filipa Lacerda | 2017-02-08 | 1 | -1/+1 |
| | | | | This reverts merge request !8688 | ||||
| * | Address feedback | Douwe Maan | 2017-02-06 | 1 | -2/+2 |
| | | |||||
| * | Add 'View on [env]' link to blobs and individual files in diffs | Douwe Maan | 2017-02-06 | 1 | -0/+2 |
| | | |||||
| * | unifies mr diff file button style | Nur Rony | 2017-01-30 | 1 | -1/+1 |
| | | |||||
| * | Revert "Merge branch '25709-diff-file-overflow' into 'master'" | Jacob Schatz | 2017-01-21 | 1 | -1/+1 |
| | | | | This reverts merge request !8475 | ||||
| * | Remove fixed class from file actions25709-diff-file-overflow | Annabel Dunstone Gray | 2017-01-19 | 1 | -1/+1 |
| | | |||||
| * | Use flexbox instead of media queries | Filipa Lacerda | 2017-01-19 | 1 | -2/+2 |
| | | | | | Move CSS to correct file | ||||
| * | fixed commit diff linking and added specsfix/diff-title | Luke "Jared" Bennett | 2017-01-14 | 1 | -1/+1 |
| | | |||||
| * | HAMLLint: Fix `SpaceInsideHashAttributes` offences | Kushal Pandya | 2016-12-31 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'jej-22869' into 'security' | Douwe Maan | 2016-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Fix information disclosure in `Projects::BlobController#update` It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that. - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) https://gitlab.com/gitlab-org/gitlab-ce/issues/22869 See merge request !2023 | ||||
| * | Unify anchor link format for MR diff files !7298 | Yar | 2016-11-15 | 1 | -2/+2 |
| | | | | | | | | | Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298 | ||||
| * | Updated positioning of copy file path button in diffsmr-copy-filename-btn-update | Phil Hughes | 2016-10-31 | 1 | -1/+0 |
| | | | | | Closes #23591 | ||||
| * | Added copy file path button to diffsmr-file-path-copy-btn | Phil Hughes | 2016-10-10 | 1 | -1/+1 |
| | | | | | Closes #23108 | ||||
| * | fix typo "this files" -> "this file" | Mike Greiling | 2016-09-29 | 1 | -1/+1 |
| | | |||||
| * | Style merge request diff dropdowns & disable comments. | Bryce Johnson | 2016-09-14 | 1 | -1/+1 |
| | | |||||
| * | edit_blob_link can receive the blob to avoid access to the repository20454-edit-button-mr | Paco Guzman | 2016-08-18 | 1 | -4/+3 |
| | | |||||
| * | Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_data | Paco Guzman | 2016-08-10 | 1 | -1/+1 |
| | | |||||
| * | Fix Mystery Guest | Herminio Torres | 2016-08-04 | 1 | -2/+2 |
| | | | | | | | 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. | ||||
| * | Cache highlighted diff lines for merge requests | Paco Guzman | 2016-08-03 | 1 | -2/+2 |
| | | | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting. | ||||
| * | Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-calls | Stan Hu | 2016-07-29 | 1 | -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 | ||||
| * | Ensure only renderable text diffs are collapsed | Sean McGivern | 2016-07-08 | 1 | -6/+1 |
| | | | | | | Other diffs (those that are too large to render anyway, image diffs, diffs suppressed by .gitattributes) should be rendered immediately. | ||||
| * | Collapse large diffs by default | Sean McGivern | 2016-07-08 | 1 | -25/+6 |
| | | | | | | When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead. | ||||
| * | Style diff and blob file headers the same way | Douwe Maan | 2016-07-06 | 1 | -30/+15 |
| | | |||||
| * | Add DiffFile#blob and #old_blob | Douwe Maan | 2016-07-06 | 1 | -3/+3 |
| | | |||||
| * | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ↵ | Stan Hu | 2016-06-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | 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 Maan | 2016-05-20 | 1 | -4/+2 |
| |\ | | | | | | | | | # Conflicts: # app/services/system_note_service.rb | ||||
| | * | Create DiffFilter and change SystemNoteService#change_title to use ↵ | Adam Butler | 2016-05-18 | 1 | -4/+2 |
| | | | | | | | | | Gitlab::Diff::InlineDiff | ||||
| * | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting | Sean McGivern | 2016-05-17 | 1 | -1/+1 |
| |/ | | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 | ||||
| * | Support supressing text file diffs on the default branch with .gitattributes | Matt Oakes | 2016-04-29 | 1 | -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 | ||||
| * | Diff design updates | Annabel Dunstone | 2016-04-07 | 1 | -5/+5 |
| | | |||||
| * | Update diff colors and icons | Annabel Dunstone | 2016-04-07 | 1 | -1/+1 |
| | | |||||
| * | change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltip | Arinde Eniola | 2016-03-20 | 1 | -1/+1 |
| | | |||||
| * | Fix bug where wrong commit ID was being used in a merge request diff to show ↵ | Stan Hu | 2016-03-19 | 1 | -1/+1 |
| | | | | | | | | | old image Closes #3769 Closes #14327 | ||||
| * | Show a notice for diffs that are too largehide-large-diffs | Yorick Peterse | 2016-03-18 | 1 | -9/+13 |
| | | | | | | | | This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster. | ||||
| * | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | 2016-01-29 | 1 | -9/+13 |
| | | |||||
| * | Fix MR diff 'Edit' buttonfix-mr-diff-edit-button | Douwe Maan | 2016-01-21 | 1 | -21/+19 |
| | | |||||
| * | Fix specs and behavior for LFS files | Douwe Maan | 2015-12-18 | 1 | -2/+2 |
| | | |||||
| * | Automatically fork a project when not allowed to edit a file. | Douwe Maan | 2015-12-18 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'serve_lfs_object' into 'master' | Douwe Maan | 2015-12-08 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |