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
AgeCommit message (Expand)Author
2017-06-01Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern
2017-05-31Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov
2017-05-30Consistent diff and blob size limit namesDouwe Maan
2017-05-26Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher
2017-05-25Address feedbackDouwe Maan
2017-05-24Address reviewDouwe Maan
2017-05-24Fix specsDouwe Maan
2017-05-24Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan
2017-05-23Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan
2017-05-23Rename Diff::File {old,new}_ref to {old,new}_shaDouwe Maan
2017-05-23Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan
2017-05-18Stop MR conflict code from blowing up when branches are missingDouwe Maan
2017-05-10Extract generic parts of Gitlab::Diff::InlineDiffMarkerDouwe Maan
2017-04-25Show correct size when MR diff overflowsSean McGivern
2017-04-24Fix commenting on an existing discussion on an unchanged line that is no long...Douwe Maan
2017-04-08Cache MR diffs by diff refsDouwe Maan
2017-04-05Fix specsDouwe Maan
2017-04-05Don't use original_discussion_idDouwe Maan
2017-04-05Better notification emails for notes and (diff) discussionsDouwe Maan
2017-03-13take nonewline context into account in diff parsermhasbini
2017-02-23Fix code for copsDouwe Maan
2017-02-23Enable Style/ConditionalAssignmentDouwe Maan
2017-02-23Enable Performance/RedundantMatchDouwe Maan
2017-02-23Enable Style/MutableConstantDouwe Maan
2017-02-13Enable `Lint/EmptyWhen` cop and correct offenseRobert Speicher
2016-12-26Fix MR with files hidden by .gitattributesSean McGivern
2016-12-02Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClassValery Sizov
2016-11-25Fix: Timeout creating and viewing merge request for binary fileValery Sizov
2016-11-14Fix Error 500 when creating a merge request that contains an image that was d...Stan Hu
2016-11-10Fix expanding a collapsed diff when converting a symlink to a regular fileAdam Niedzielski
2016-10-17Fix the diff in the merge request view when converting a symlink to a regular...Adam Niedzielski
2016-08-22Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets
2016-08-19Fix line commenting for the initial commitSean McGivern
2016-08-19Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets
2016-08-15Make merge request diff works with new FileCollection logicDmitriy Zaporozhets
2016-08-12Fix specsSean McGivern
2016-08-12Auto-highlight conflict when rich_text is calledSean McGivern
2016-08-12Add backend for merge conflicts readingSean McGivern
2016-08-03switch from diff_file_collection to diffsPaco Guzman
2016-08-03Introduce Compare model in the codebase.Paco Guzman
2016-08-03Move to Gitlab::Diff::FileCollectionPaco Guzman
2016-08-03Cache highlighted diff lines for merge requestsPaco Guzman
2016-07-29Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher
2016-07-21Add Discussion model to represent MR/diff discussionDouwe Maan
2016-07-20Ensure to_json methods take optional argumentSean McGivern
2016-07-19Fix method visibility in inline diff classGrzegorz Bizon
2016-07-18Collapsed diffs lines/size don't accumulate to overflow diffs.Paco Guzman
2016-07-13Merge branch 'better-parallel-diff' into 'master' Robert Speicher
2016-07-13Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan
2016-07-13Actually render old and new sections of parallel diff next to each otherDouwe Maan