Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@12-7-stable-ee | GitLab Bot | 2020-01-21 | 1 | -2/+7 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@12-6-stable-ee | GitLab Bot | 2019-12-20 | 1 | -4/+4 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@12-4-stable-ee | GitLab Bot | 2019-10-22 | 1 | -2/+48 |
| | |||||
* | Cleanup usages of `JSON.parse` in specs | Peter Leitzen | 2019-07-16 | 1 | -6/+3 |
| | | | | Prefer `json_response` where applicable. | ||||
* | Merge branch '58583-confidential-mr-branch-backend' into 'master' | Rémy Coutable | 2019-07-01 | 1 | -1/+70 |
|\ | | | | | | | | | 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 project | Patrick Bajao | 2019-07-01 | 1 | -3/+3 |
| | | | | | | | | | | 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-backend | Patrick Bajao | 2019-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | 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 issue | Patrick Bajao | 2019-06-29 | 1 | -0/+69 |
| | | | | | | | | | | | | | | | | 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-branches | Igor Drozdov | 2019-06-28 | 1 | -0/+23 |
|/ | | | | Extract diverging_commit_counts into a service class | ||||
* | Make KubernetesService readonly | James Fargher | 2019-06-18 | 1 | -17/+5 |
| | | | | | | | | We are deprecating this service in favor of instance wide clusters. Therefore we removed some code that is not anymore needed for a readonly cluster and also we added some flags to allow for this deprecation. These flags are to be removed in the next release when we finally completelly remove KubernetesService. | ||||
* | Add some frozen string to spec/**/*.rb | gfyoung | 2019-04-15 | 1 | -0/+2 |
| | | | | | | | | | | Adds frozen string to the following: * spec/bin/**/*.rb * spec/config/**/*.rb * spec/controllers/**/*.rb xref https://gitlab.com/gitlab-org/gitlab-ce/issues/59758 | ||||
* | Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branch | Sam Bigelow | 2019-01-22 | 1 | -3/+3 |
| | | | | This is to match `git branch -D <branchname>` | ||||
* | Update specs to rails5 formatblackst0ne-convert-specs-rails5-style | blackst0ne | 2018-12-19 | 1 | -69/+106 |
| | | | | | | | | | | Updates specs to use new rails5 format. The old format: `get :show, { some: params }, { some: headers }` The new format: `get :show, params: { some: params }, headers: { some: headers }` | ||||
* | Resolve "Rename the `Master` role to `Maintainer`" Backend | Mark Chao | 2018-07-11 | 1 | -1/+1 |
| | |||||
* | Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rb | Rémy Coutable | 2018-05-24 | 1 | -0/+18 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Re-enable allowing n+1 Gitaly calls for cold cache44861-mark-gitaly-nplus-one-again | Lin Jen-Shin | 2018-04-03 | 1 | -1/+17 |
| | | | | | Whenever cache is enabled and cold, branches index still makes n+1 calls. Make sure we catch this. | ||||
* | Add overview of branches and a filter for active/stale branches | Takuya Noguchi | 2018-03-06 | 1 | -0/+33 |
| | |||||
* | Fix when branch creation fails don't post system note | Mateusz Bajorski | 2017-12-26 | 1 | -0/+14 |
| | | | | Closes #24347 | ||||
* | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specs | blackst0ne | 2017-12-22 | 1 | -2/+2 |
| | |||||
* | Aling shared_exmaples to "same behavior between KubernetesService and ↵ | Shinya Maeda | 2017-11-28 | 1 | -3/+3 |
| | | | | Platform::Kubernetes" | ||||
* | Replce kubernetes_service and deployment_service to deployment_platform | Shinya Maeda | 2017-11-28 | 1 | -18/+12 |
| | |||||
* | Duplicate spec for Platform::Kubernetes with kubernetes_project | Shinya Maeda | 2017-11-28 | 1 | -24/+28 |
| | |||||
* | Add test suit for platform::kubernetes | Shinya Maeda | 2017-11-28 | 1 | -0/+18 |
| | |||||
* | Refactor `have_http_status` into `have_gitlab_http_status` in the specs | Jacopo | 2017-10-20 | 1 | -14/+14 |
| | |||||
* | Stop using `branch_names.include?` and use `branch_exists?` | Andrew Newdigate | 2017-10-10 | 1 | -1/+1 |
| | |||||
* | Resolve "Error 500 in non-UTF8 branch names" | Micael Bergeron | 2017-09-12 | 1 | -0/+15 |
| | |||||
* | Change all `:empty_project` to `:project`rs-empty_project-default | Robert Speicher | 2017-08-02 | 1 | -1/+1 |
| | |||||
* | Rename many path_with_namespace -> full_path | Gabriel Mazetto | 2017-08-01 | 1 | -3/+3 |
| | |||||
* | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -4/+4 |
| | |||||
* | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 1 | -6/+6 |
| | |||||
* | Revert 'New file from interface on existing branch'dm-revert-mr-8427 | Douwe Maan | 2017-06-09 | 1 | -14/+0 |
| | |||||
* | Merge request widget redesign | Fatih Acet | 2017-05-09 | 1 | -16/+81 |
| | |||||
* | Allow to create new branch and empty WIP merge request from issue page | Alfredo Sumaran | 2017-05-04 | 1 | -1/+37 |
| | |||||
* | New file from interface on existing branch | Jacopo | 2017-03-13 | 1 | -0/+14 |
| | | | | | | Now you can create a new file and select a target_branch != source_branch. If the file that you want to create already exists on the target branch an error message is shown A glDropdown is used to select and create a new branch instead of a text field. | ||||
* | Fix json response in branches controller | George Andrinopoulos | 2017-03-06 | 1 | -0/+23 |
| | |||||
* | Merge branch 'dm-more-namespace-full-path' into 'master' | Sean McGivern | 2017-02-24 | 1 | -14/+14 |
|\ | | | | | | | | | Use Namespace#full_path instead of #path where appropriate See merge request !9495 | ||||
| * | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-path | Douwe Maan | 2017-02-23 | 1 | -14/+14 |
| | | |||||
* | | Fixes after reviewcreate_branch_repo_less | Valery Sizov | 2017-02-23 | 1 | -8/+2 |
| | | |||||
* | | Create master branch first if project is repository-less | Valery Sizov | 2017-02-23 | 1 | -1/+44 |
|/ | |||||
* | Use `empty_project` where possible in controller specsrs-empty_project-controllers | Robert Speicher | 2017-01-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'jej-fix-missing-access-check-on-issues' into 'security' | Douwe Maan | 2016-11-28 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix missing access checks on issue lookup using IssuableFinder 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] :white_check_mark: app/controllers/projects/branches_controller.rb:39 - `before_action :authorize_push_code!` helpes limit/prevent exploitation. Always checks for reporter access so fine with confidential issues, issues only visible to team, etc. - [x] :traffic_light: app/models/cycle_analytics/summary.rb:9 [`.count`] - [x] :white_check_mark: app/controllers/projects/todos_controller.rb:19 - [x] Potential double render in app/controllers/projects/todos_controller.rb - https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#cedccb227af9bfdf88802767cb58d43c2b977439_24_24 See merge request !2030 | ||||
* | Add button to delete all merged branches | Toon Claes | 2016-11-09 | 1 | -4/+54 |
| | | | | | | | | It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. Fixes #21076. | ||||
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-lines | Grzegorz Bizon | 2016-07-01 | 1 | -2/+0 |
| | |||||
* | Use HTTP matchers if possible | Z.J. van de Weg | 2016-06-27 | 1 | -5/+5 |
| | |||||
* | Update test since branch removal does not render template anymoredz-code-tab | Dmitriy Zaporozhets | 2016-06-03 | 1 | -4/+0 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Return status code 303 after a branch DELETE operation to avoid project deletion | Stan Hu | 2016-04-06 | 1 | -0/+14 |
| | | | | Closes #14994 | ||||
* | Incorporate review | Zeger-Jan van de Weg | 2016-03-15 | 1 | -5/+14 |
| | |||||
* | Enhance new branch button on an issue | Zeger-Jan van de Weg | 2016-03-15 | 1 | -35/+56 |
| | |||||
* | Move a few controller specs to their correct locationsrs-move-controller-specs | Robert Speicher | 2016-02-18 | 1 | -0/+104 |