summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '26300-line-numbers-are-off-in-dynamically-loaded-diff-chunks' i...Jacob Schatz2017-02-032-8/+8
|\
| * ensure linenumber data attribute is correct for the last line in a diff chunk26300-line-numbers-are-off-in-dynamically-loaded-diff-chunksMike Greiling2017-01-182-8/+6
| * ensure last line in diff block is contained within a table row elementMike Greiling2017-01-182-2/+4
* | Merge branch '26829-diff-unfolding-links-erroneously-present-on-no-newline-li...Jacob Schatz2017-02-031-2/+10
|\ \
| * | prevent nonewline type diff lines from containing unfolding link26829-diff-unfolding-links-erroneously-present-on-no-newline-linesMike Greiling2017-01-181-2/+10
| |/
* | unifies mr diff file button styleNur Rony2017-01-301-1/+1
* | Merge branch '27021-line-numbers-now-in-copy-pasta-data' into 'master' Fatih Acet2017-01-251-2/+2
|\ \
| * | Prevent copying of line numbers in parallel diff view27021-line-numbers-now-in-copy-pasta-datasamrose32017-01-221-2/+2
* | | HAMLLint: Fix `RubyComments` offencesKushal Pandya2017-01-241-1/+1
* | | HAMLLint: Fix `UnnecessaryStringOutput` offencesKushal Pandya2017-01-241-1/+1
* | | HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-242-4/+4
|/ /
* | Revert "Merge branch '25709-diff-file-overflow' into 'master'"Jacob Schatz2017-01-212-4/+4
* | Remove fixed class from file actions25709-diff-file-overflowAnnabel Dunstone Gray2017-01-191-1/+1
* | Use flexbox instead of media queriesFilipa Lacerda2017-01-191-2/+2
* | Fix haml linter errorsFilipa Lacerda2017-01-191-3/+3
* | Adds tooltipsFilipa Lacerda2017-01-191-3/+3
* | Responsive title in diffs inline, side by side, with and without sidebarFilipa Lacerda2017-01-191-3/+3
|/
* Merge branch 'issue_25017' into 'master' Sean McGivern2017-01-171-2/+2
|\
| * Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-121-2/+2
* | fixed commit diff linking and added specsfix/diff-titleLuke "Jared" Bennett2017-01-141-1/+1
|/
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-316-30/+29
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-312-4/+4
* HAMLLint: fix `AltText` offencesKushal Pandya2016-12-311-7/+7
* Rename filename to file path in tooltip of file header in merge request diffVictor Wu2016-12-261-1/+1
* Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' i...Douwe Maan2016-11-291-1/+1
|\
| * Don't use diff_line_content for emailsSean McGivern2016-11-281-1/+1
| * Don't remove + / - signs from diff emailsSean McGivern2016-11-281-1/+1
* | Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-281-1/+1
|/
* Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into 'mas...Sean McGivern2016-11-173-9/+11
|\
| * Unify anchor link format for MR diff files !7298Yar2016-11-153-9/+11
* | Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-1/+1
|/
* Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-101-1/+1
* Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran2016-11-091-2/+2
|\
| * Remove an extra leading space from diff contentHiroyuki Sato2016-11-041-2/+2
* | Add width to caret to rid ourselves of the shiftfixed-width-caretJacob Schatz2016-11-041-1/+1
|/
* Updated positioning of copy file path button in diffsmr-copy-filename-btn-updatePhil Hughes2016-10-312-1/+2
* Fix horizontal padding for highlight blocks23661-lacking-padding-on-syntax-highlight-blocks-in-diff-commentsLuke Bennett2016-10-251-1/+1
* Added copy file path button to diffsmr-file-path-copy-btnPhil Hughes2016-10-101-1/+1
* MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-061-1/+2
* Merge branch '22343-honor-user-fixed-layout-pref' into 'master' Fatih Acet2016-10-041-2/+0
|\
| * ensure the 'fixed layout' preference is honored whenever possibleMike Greiling2016-09-201-2/+0
* | Merge branch '21369-make-it-clearer-that-diffs-can-be-collapsed' into 'master' Jacob Schatz2016-10-012-1/+4
|\ \
| * | Updated diff toggle targets and added iconLuke Bennett2016-09-032-1/+4
| |/
* | fix typo "this files" -> "this file"Mike Greiling2016-09-291-1/+1
* | Style merge request diff dropdowns & disable comments.Bryce Johnson2016-09-141-1/+1
|/
* Fix expansion of discussions in diffdiff-line-comment-vuejsDouwe Maan2016-08-182-4/+2
* Improve performance of MR show pageDouwe Maan2016-08-182-10/+16
* Merge branch '20454-edit-button-mr' into 'master' Douwe Maan2016-08-181-4/+3
|\
| * edit_blob_link can receive the blob to avoid access to the repository20454-edit-button-mrPaco Guzman2016-08-181-4/+3
* | Fix email line-height in Outlookoutlook-email-spacingSean McGivern2016-08-171-1/+6
|/
View Lorry Controller Status