summaryrefslogtreecommitdiff
path: root/app/controllers/projects/compare_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add signature verification badge to compare viewMarc2018-05-071-16/+49
|
* Fix n+1 issue by not reloading fully loaded blobsAlejandro Rodríguez2018-03-051-4/+2
|
* Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-0/+4
|
* Make the labels in the Compare form less confusing21331-improve-confusing-compare-pageRémy Coutable2017-09-151-1/+1
| | | | | | | | | * Improve the descriptive text * Rename "from" to "Target" and "to" to "Source" * Swap "Target" and "Source" to have the same order as in MRs * Reworded "Switch base of comparison" to "Swap versions" Signed-off-by: Rémy Coutable <remy@rymai.me>
* Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-061-1/+2
|
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-2/+2
|
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
|
* 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 ↵Lin Jen-Shin2017-01-261-1/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...
| * 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
| | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20601323
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (60 commits) Refactor SSH keys docs Improvements to setting up ssh Do not reload diff for merge request made from fork when target branch in fork is updated Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items Changes after review Fix broken test Adds CHANGELOG entry Adds tests Uniformize props name format Replace commit icon svg logic Replace play icon svg logic Update docs to reflect new defaults on omnibus Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' remove unnecessary issues event filter on comments tab Updating reference to database password Add CHANGELOG entry Displays milestone remaining days only when it's present ...
| * Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace MR access checks with use of MergeRequestsFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested - [x] :bomb: app/finders/notes_finder.rb:17 - [x] :warning: app/views/layouts/nav/_project.html.haml:80 [`.count`] - [x] :bomb: app/controllers/concerns/creates_commit.rb:84 - [x] :traffic_light: app/controllers/projects/commits_controller.rb:24 - [x] :traffic_light: app/controllers/projects/compare_controller.rb:56 - [x] :vertical_traffic_light: app/controllers/projects/discussions_controller.rb:29 - [x] :white_check_mark: app/controllers/projects/todos_controller.rb:27 - [x] :vertical_traffic_light: app/models/commit.rb:268 - [x] :white_check_mark: lib/gitlab/search_results.rb:71 - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)` - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`. - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?` See merge request !2033
* | Introduce Repository#with_tmp_ref which we needLin Jen-Shin2016-12-081-1/+2
|/ | | | | commits from the other repository. We'll cleanup the tmp ref after we're done with our business.
* 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
| | | | So we have raw_diffs too
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-12/+6
| | | This object will manage Gitlab::Git::Compare instances
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-2/+2
| | | Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-3/+3
| | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* 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
| | | | Closes #19573
* DRY up diff_for_path actionsSean McGivern2016-07-081-40/+28
| | | | | | 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
* Remove unused argument to CompareService#executeSean McGivern2016-07-081-4/+10
|
* Collapse large diffs by defaultSean McGivern2016-07-081-1/+17
| | | | | When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
* 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
| | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
* Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-0/+1
| | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
* Merge branch 'compare-first-commit' into 'master' Robert Speicher2015-11-171-2/+2
|\ | | | | | | | | | | | | Correctly set comparison first commit when range includes a merge commit Fixes #3207. See merge request !1814
| * 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
|/ | | | | | fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
* 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
| | | | Closes #2593
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-7/+2
| | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-2/+7
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status