summaryrefslogtreecommitdiff
path: root/app/controllers/projects/compare_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Remove @commit in compare and MR controllersDouwe Maan2017-05-231-4/+1
* Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-231-1/+0
* Fix specsDouwe Maan2017-04-091-1/+0
* Address feedbackDouwe Maan2017-02-061-3/+2
* Add feature specsDouwe Maan2017-02-061-2/+2
* Improve performance of finding last deployed environmentDouwe Maan2017-02-061-1/+1
* Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-061-0/+4
* Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-261-1/+10
|\
| * refactor rubocop suggestionMartin Cabrera2017-01-161-1/+1
| * Refactored ‘from’ and ‘to’ variable preservationMartin Cabrera2017-01-161-10/+6
| * from or to get variables gets preserved if the other one is missingMartin Cabrera2017-01-151-2/+9
| * Changed alert message character: from & to and Martin Cabrera2017-01-151-1/+2
| * Fix Compare page throws 500 error when any branch/reference is not selectedMartin Cabrera2017-01-101-1/+6
* | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-041-2/+2
* | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-101-1/+1
|\ \ | |/
| * Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-1/+1
* | Introduce Repository#with_tmp_ref which we needLin Jen-Shin2016-12-081-1/+2
|/
* Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-031-2/+2
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-2/+2
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-12/+6
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-2/+2
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-3/+3
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-1/+1
* Apply diff view cookie on comparecompare-code-viewPhil Hughes2016-07-151-0/+1
* DRY up diff_for_path actionsSean McGivern2016-07-081-40/+28
* Remove unused argument to CompareService#executeSean McGivern2016-07-081-4/+10
* Collapse large diffs by defaultSean McGivern2016-07-081-1/+17
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-5/+13
* Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-131-0/+1
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-1/+1
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-6/+6
* Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-101-6/+17
* Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-271-1/+1
* Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-201-2/+2
* More refactoring from last code review. #3945Rubén Dávila2016-01-141-1/+1
* Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-0/+1
* Merge branch 'compare-first-commit' into 'master' Robert Speicher2015-11-171-2/+2
|\
| * Correctly set comparison first commit when range includes a merge commitcompare-first-commitDouwe Maan2015-11-171-2/+2
* | Add ignore white space option in merge request diffMinsik Yoon2015-11-131-1/+2
|/
* Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-201-1/+2
* Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-181-4/+6
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-7/+2
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-2/+7
* Refactor compare and fetch logicDmitriy Zaporozhets2015-07-151-7/+2
* Link Commits tab to current branch from Compare page.Douwe Maan2015-05-091-1/+2
* Unescape branch names in compare commitStan Hu2015-04-301-2/+4
* Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-2/+2
* Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-211-1/+1
|\
| * Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't...Douwe Maan2015-02-201-1/+1
* | Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-1/+2
|/
View Lorry Controller Status