summaryrefslogtreecommitdiff
path: root/app/controllers/projects/branches_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42GitLab Bot2021-11-181-2/+2
|
* Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42GitLab Bot2021-10-201-0/+5
|
* Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42GitLab Bot2021-06-161-13/+7
|
* Add latest changes from gitlab-org/security/gitlab@13-11-stable-eeGitLab Bot2021-04-271-1/+1
|
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-201-1/+1
|
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-181-4/+2
|
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-171-16/+31
|
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-191-12/+1
|
* 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-1-stable-eeGitLab Bot2020-06-181-1/+13
|
* Add latest changes from gitlab-org/gitlab@13-0-stable-eeGitLab Bot2020-05-201-1/+0
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-031-4/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-021-2/+0
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-011-0/+19
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-181-1/+1
|
* Fix Ruby 2.5 compatibility for diverging counts of branchesDaniel Gerhardt2019-08-061-1/+1
| | | | | | | | | | | | | | | | !31480 does not fully restore compatibility because another Ruby 2.6 feature besides `Enumerable#filter` was used in commit ca5cd7b7. The use of `Enumerable#to_h`'s block is now replaced by an explicit `Enumerable#map` call. Error message: TypeError (wrong element type Gitlab::Git::Branch at 0 (expected array)): app/controllers/projects/branches_controller.rb:53:in `to_h' See https://bugs.ruby-lang.org/issues/15143. Fixes #64143.
* Create private merge requests in forksPhil Hughes2019-07-051-1/+1
| | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* Merge branch '58583-confidential-mr-branch-backend' into 'master'Rémy Coutable2019-07-011-2/+14
|\ | | | | | | | | Support creating an MR/branch on a fork from an issue See merge request gitlab-org/gitlab-ce!29831
| * Check if user can `update_issue` on projectPatrick Bajao2019-07-011-1/+1
| | | | | | | | | | If user can update an issue under the specified confidential issue project, should be able to find the project.
| * Fix issues when creating system notes58583-confidential-mr-branch-backendPatrick Bajao2019-06-291-2/+3
| | | | | | | | | | | | | | | | | | | | When `confidential_issue_project_id` is set and the issue is under that project, create the a note about branch creation in that project. If not, do nothing. When creating `new_merge_request` system note, set the project where the MR will be referenced from so it'll be linked to when the MR is created in another project.
| * Support branch creation from confidential issuePatrick Bajao2019-06-291-1/+12
| | | | | | | | | | | | | | | | Accept a `confidential_issue_project_id` param which will be used for the system note target. This also includes some refactoring on the spec to use shared examples.
* | Add endpoint for fetching diverging commit countsid-stale-branchesIgor Drozdov2019-06-281-9/+13
|/ | | | Extract diverging_commit_counts into a service class
* Introduce ServiceResponse to wrap around responseLin Jen-Shin2019-04-221-4/+4
| | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/60730
* Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizerDmitriy Zaporozhets2019-04-121-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update comments about N + 1 Gitaly callsZeger-Jan van de Weg2019-04-091-1/+1
| | | | | To make sure all known issues are linked to the correct epic, I've gone through the code base, and updated the comments where required.
* Externalize strings in projects controllersMartin Wortschack2019-03-271-2/+2
| | | | | | | - concerns - dashboard - groups - import
* Adapt that diverging commits could be just one baradd-client-for-count-diverging-commitsLin Jen-Shin2019-02-111-1/+2
| | | | | refactors the ui for diverging commits so that it's only a single bar instead of two separate bars
* Rename project's pipelines relationFrancisco Javier López2018-12-051-1/+1
|
* render :nothing option is deprecated, Use head method to respond with empty ↵Jasper Maes2018-11-231-1/+1
| | | | response body.
* 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.
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
|
* Counting commits is done by Gitalyzj-counting-commitsZeger-Jan van de Weg2018-06-191-1/+4
| | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/382
* Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-againLin Jen-Shin2018-04-031-3/+7
| | | | | Whenever cache is enabled and cold, branches index still makes n+1 calls. Make sure we catch this.
* Reuse root_ref_hash for performance on BranchesTakuya Noguchi2018-03-281-10/+6
|
* Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-061-5/+36
|
* Refactor success status in branch controllerMateusz Bajorski2017-12-271-3/+5
|
* Fix when branch creation fails don't post system noteMateusz Bajorski2017-12-261-1/+1
| | | | Closes #24347
* Replce kubernetes_service and deployment_service to deployment_platformShinya Maeda2017-11-281-1/+1
|
* Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-271-0/+2
|
* Fix the default branches sorting to actually be 'Last updated'26890-fix-default-branches-sortingRémy Coutable2017-09-251-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-3/+7
|
* Merge branch '26890-sort-branches' into 'master'Rémy Coutable2017-07-281-1/+1
|\ | | | | | | | | | | | | This makes the default sort order for branches 'recently updated' rather than by name. Closes #26890 See merge request !8666
| * WIP: This makes the default sort order for branches 'recently updated' ↵26890-sort-branchesMatt Lee2017-01-201-1/+1
| | | | | | | | rather than by name.
* | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-6/+5
| |
* | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
| |
* | Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-091-6/+1
| |
* | Merge request widget redesignFatih Acet2017-05-091-0/+1
| |
* | Add confirm delete protected branch modalSam Rose2017-05-081-4/+8
| |
* | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-13/+21
| |