summaryrefslogtreecommitdiff
path: root/app/controllers/projects/compare_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-11-221-2/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-09-291-3/+8
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-07-251-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-06-061-1/+5
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-06-011-2/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-05-311-1/+8
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-04-111-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2022-02-171-8/+13
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-11-121-0/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-08-091-5/+0
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-06-021-3/+3
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-04-221-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-04-221-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-04-201-0/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-04-071-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-02-241-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-02-231-0/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2021-02-221-14/+38
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-10-081-0/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-181-0/+1
|
* Check for valid refs in CommitController before doing anythingStan Hu2018-12-091-6/+0
| | | | | | | | | | Before a 404 would be rendered only after a request to Gitaly would return with an InvalidArgument error. Now we check that the ref have a valid format before sending it to Gitaly. In both cases, a 404 is returned to the user, but this change prevents Gitaly from generating error noise in production. Closes https://gitlab.com/gitlab-org/gitaly/issues/1425
* Reject invalid branch names in repository compare controllerStan Hu2018-10-081-0/+17
| | | | Closes #51003
* Enable even more frozen string in app/controllersgfyoung2018-09-251-0/+2
| | | | | | | | | | | | Enables frozen string for some vestigial files as well as the following: * app/controllers/projects/**/*.rb * app/controllers/sherlock/**/*.rb * app/controllers/snippets/**/*.rb * app/controllers/users/**/*.rb Partially addresses #47424.
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-0/+2
| | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* Speed up diff comparisons by limiting number of commit messages renderedStan Hu2018-08-221-1/+1
| | | | | | | When a diff has a significant number of commits, the previous behavior would attempt to render the Markdown on all the commit messages but only display 1000 of them. To avoid additional work, we only need to render the Markdown on the set that is displayed.
* 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
|