summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
Commit message (Expand)AuthorAgeFilesLines
* Add table for files in merge request diffsSean McGivern2017-06-161-17/+37
* Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-011-1/+1
* Added Cop to blacklist the use of serializedocument-not-using-serializeYorick Peterse2017-05-311-2/+2
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-251-0/+23
|\
| * Change code comment formattingdm-diff-cleanupDouwe Maan2017-05-231-1/+3
| * Remove @commit in compare and MR controllersDouwe Maan2017-05-231-0/+3
| * Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-231-0/+18
* | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-231-3/+2
|/
* Show correct size when MR diff overflowsSean McGivern2017-04-251-1/+1
* Statisfy Robertcop and Seancopdm-outdated-diff-linkDouwe Maan2017-04-111-9/+3
* Add specsDouwe Maan2017-04-101-0/+12
* Fix find_by_diff_refsDouwe Maan2017-04-081-1/+1
* Fix specs and make tweaksDouwe Maan2017-04-081-1/+4
* Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-081-0/+1
* Fix issues importing forked projectsJames Lopez2017-04-041-8/+10
* Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-2/+2
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-2/+2
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-2/+2
* Enable Style/MutableConstantDouwe Maan2017-02-231-1/+1
* Enable Style/DotPositionDouwe Maan2017-02-231-2/+2
* Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-261-11/+11
|\
| * Merge branch 'issue_25017' into 'master' Sean McGivern2017-01-171-10/+10
| |\
| | * Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-121-10/+10
| * | Absorb gitlab_gitRobert Speicher2017-01-041-1/+1
| |/
* | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-061-2/+2
* | Introduce Repository#with_tmp_ref which we needLin Jen-Shin2016-12-081-1/+2
|/
* Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-011-5/+5
* Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-211-2/+4
* Also keep commits from source_project around, feedback:Lin Jen-Shin2016-10-251-3/+5
* Refactor straight compare diff codeDmitriy Zaporozhets2016-10-121-2/+2
* Improve tests for merge request diff modelDmitriy Zaporozhets2016-10-121-1/+1
* Use straight diff approach when compare merge request versionsDmitriy Zaporozhets2016-10-121-2/+5
* Fix Error 500 when viewing old merge requests with bad diff datash-fix-issue-20776Stan Hu2016-10-101-1/+13
* So that st_commits could never be nilLin Jen-Shin2016-09-221-4/+6
* For empty merge_request_diff st_commits would be nilfix-pipeline-for-empty-merge-request-diffLin Jen-Shin2016-09-221-1/+3
* Show all pipelines from all merge_request_diffs:Lin Jen-Shin2016-09-191-0/+8
* Refactor merge request version compare featureDmitriy Zaporozhets2016-09-071-0/+4
* Change the way merge request diff compare worksdz-merge-request-versionDmitriy Zaporozhets2016-08-251-18/+6
* Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-251-8/+8
* Make sure merge request is fetched before collecting base sha in merge reques...Dmitriy Zaporozhets2016-08-191-0/+1
* Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-151-1/+1
* Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-5/+9
* Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-151-4/+8
|\
| * Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-061-1/+1
| * change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-031-5/+5
| * Speedup DiffNote#active? on discussions, preloading noteables and avoid touch...Paco Guzman2016-08-021-0/+4
* | Fix merge request diff create and head_commit_sha compatibilityDmitriy Zaporozhets2016-08-151-3/+14
* | Change the way old merge request diff handledDmitriy Zaporozhets2016-08-151-11/+18
* | Load merge request versions without loading whole diff from databaseDmitriy Zaporozhets2016-08-091-0/+4
* | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-021-23/+31