summaryrefslogtreecommitdiff
path: root/app/controllers/projects/commit_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-211-0/+2
|
* Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot2020-08-201-2/+6
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-081-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-181-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-151-0/+1
|
* Merge branch 'security-commit-private-related-mr' into 'master'Yorick Peterse2019-03-041-1/+5
|\ | | | | | | | | | | | | Don't allow non-members to see private related MRs Closes #2787 See merge request gitlab/gitlabhq!2866
| * Modify MergeRequestsFinder to allow filtering by commitPatrick Bajao2019-01-281-1/+5
| |
* | Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-copRémy Coutable2019-01-241-2/+2
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Adds pagination to pipelines table in merge request page28249-add-paginationFilipa Lacerda2018-10-311-1/+2
|
* 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/+4
| | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* Fix branch name in case of new merge request cherry pickGeorge Andrinopoulos2018-08-191-1/+1
|
* Add target branch to cherry pick confirmation messageGeorge Andrinopoulos2018-08-191-1/+1
|
* Show the status of a user in interactionsBob Van Landuyt2018-07-301-2/+7
| | | | | | | | | | | | | | | The status is shown for - The author of a commit when viewing a commit - Notes on a commit (regular/diff) - The user that triggered a pipeline when viewing a pipeline - The author of a merge request when viewing a merge request - The author of notes on a merge request (regular/diff) - The author of an issue when viewing an issue - The author of notes on an issue - The author of a snippet when viewing a snippet - The author of notes on a snippet - A user's profile page - The list of members of a group/user
* Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-2/+6
| | | | | | | | | | | | | Prior to this change, this was done through unicorn. In theory this could time out. Workhorse has been sending these raw patches and diffs for a long time and is stable in doing so. Added bonus is the fact that `Commit#to_patch` can be removed. `Commit#to_diff` too, which closes https://gitlab.com/gitlab-org/gitaly/issues/324 Closes https://gitlab.com/gitlab-org/gitaly/issues/1196
* Resolve "tree/master shows incorrect CI build status"Lin Jen-Shin2018-04-111-0/+1
|
* Display related merge requests in commit detail pageHiroyuki Sato2018-01-121-1/+13
|
* Allow commenting on individual commits inside an MRDouwe Maan2017-12-071-0/+17
|
* Batchload blobs for diff generationZeger-Jan van de Weg2017-11-211-7/+2
| | | | | | | | | | | | | | | | | | After installing a new gem, batch-loader, a construct can be used to queue data to be fetched in bulk. The gem was also introduced in both gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs are not merged yet. For the generation of diffs, both the old blob and the new blob need to be loaded. This for every file in the diff, too. Now we collect all these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed, which I expect to be valid, but this needs to be confirmed by a full CI run. Possibly closes: - https://gitlab.com/gitlab-org/gitlab-ce/issues/37445 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37599 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
* implemented using an ivar, and added specsBrett Walker2017-10-131-2/+7
|
* moved throttling into the controller. if we hit the throttlingBrett Walker2017-10-121-2/+5
| | | | threshhold, a message is shown indicating we didn't perform the search
* if the branch/tag count is over a certain limit, don't executeBrett Walker2017-10-111-2/+2
| | | | the long running git query
* Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-1/+6
|
* WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-061-1/+1
| | | | | | | this will remove the need make N queries (per-note) at the cost of having to mark notes with an attribute this opens up the possibility for other special roles for notes
* Update Pipeline's badge count in Merge Request and Commits view to match ↵Filipa Lacerda2017-07-141-3/+8
| | | | real-time content
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-3/+3
|
* Merge request widget redesignFatih Acet2017-05-091-1/+1
|
* Refactor changing files in web UIDouwe Maan2017-04-201-7/+3
|
* Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-0/+2
|\
| * Enable polling for pipelines table other pagesToon Claes2017-04-061-0/+2
| | | | | | | | | | | | | | Also poll for pipeline changes on: - Pipeline table on commit page - Pipeline table on merge request page - Pipeline table on new merge request page
* | Address review commentsDouwe Maan2017-04-051-1/+1
| |
* | Correctly display multiple separate discussions on the same diff lineDouwe Maan2017-04-051-1/+1
| |
* | Add option to start a new discussion on an MRDouwe Maan2017-04-051-11/+9
|/
* Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-12/+20
|
* Merge branch 'route-map' into 'master' Robert Speicher2017-02-071-0/+2
|\ | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * Address feedbackDouwe Maan2017-02-061-3/+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/+3
| |
* | Moves pagination to shared folderFilipa Lacerda2017-02-031-1/+0
|/ | | | | | | | | | | | | | | | | | | Document and remove unused code Declare components in a consistent way; Use " instead of ' to improve consistency; Update documentation; Fix commit author verification to match the use cases; Adds tests for the added components Fix paths in pagination spec Adds tests to pipelines table used in merge requests and commits Use same resource interceptor Fix eslint error
* Merge remote-tracking branch 'upstream/master' into ↵fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-021-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
| * Expose serialized pipelines for commit pipelinesGrzegorz Bizon2017-01-271-0/+11
| |
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-261-5/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * Add sorting pipeline for a commitTakuya Noguchi2017-01-191-5/+0
| |
* | Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-061-5/+3
|/ | | | | | | | Removing those weird setup in assign_change_commit_vars fixed all the failures in the tests. I still cannot say why but clearly we need to have better names. It's so confusing right now. We should seriously stop fiddling those instance variables.
* Changes after reviewFilipa Lacerda2016-12-211-1/+1
| | | | | | Fix broken test Remove spinach tests for the builds tab
* Remove builds tab from commitFilipa Lacerda2016-12-211-29/+2
| | | | | | Remove unused file Fix commit link
* Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add Pipelines for CommitKamil Trzcinski2016-09-271-8/+9
|
* Fix autocomplete on commit and issue/MR edit pagesDouwe Maan2016-08-121-1/+1
|
* Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-111-2/+2
| | | | | | | | | | | This change simplifies a Pipeline processing by introducing a special new status: created. This status is used for all builds that are created for a pipeline. We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped). This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled. This also allows us to visualise a full pipeline (with created builds). This also removes an after_touch used for updating a pipeline state parameters. Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.