Commit Graph

64 Commits

Author SHA1 Message Date
GitLab Bot b267f3a3ac Add latest changes from gitlab-org/gitlab@master 2021-10-28 18:14:18 +00:00
GitLab Bot 87598f1576 Add latest changes from gitlab-org/gitlab@master 2021-10-06 21:12:16 +00:00
GitLab Bot 4abacac9af Add latest changes from gitlab-org/gitlab@master 2021-09-28 15:11:30 +00:00
GitLab Bot 95d309bfb8 Add latest changes from gitlab-org/gitlab@master 2021-05-27 21:10:59 +00:00
GitLab Bot 60bb1b9734 Add latest changes from gitlab-org/gitlab@master 2021-03-04 18:09:08 +00:00
GitLab Bot 5a2284f350 Add latest changes from gitlab-org/gitlab@master 2020-12-16 12:09:53 +00:00
GitLab Bot 45ccc5610c Add latest changes from gitlab-org/gitlab@master 2020-06-15 00:08:43 +00:00
GitLab Bot 0526dc1e68 Add latest changes from gitlab-org/gitlab@master 2020-06-11 12:08:54 +00:00
GitLab Bot 8b0ef13236 Add latest changes from gitlab-org/gitlab@master 2020-06-03 18:08:28 +00:00
GitLab Bot c7ad2610df Add latest changes from gitlab-org/gitlab@master 2020-05-14 09:07:53 +00:00
GitLab Bot db24ab2b72 Add latest changes from gitlab-org/gitlab@master 2020-01-28 12:08:44 +00:00
GitLab Bot 22e9af3c8b Add latest changes from gitlab-org/gitlab@master 2020-01-27 12:08:35 +00:00
GitLab Bot 898e2cc1df Add latest changes from gitlab-org/gitlab@master 2019-12-20 09:24:38 +00:00
GitLab Bot 1caa60060b Add latest changes from gitlab-org/gitlab@master 2019-12-19 00:08:01 +00:00
GitLab Bot 7f8330873c Add latest changes from gitlab-org/gitlab@master 2019-12-18 21:07:37 +00:00
GitLab Bot e723867717 Add latest changes from gitlab-org/gitlab@master 2019-12-17 18:07:48 +00:00
GitLab Bot ab7cf450ba Add latest changes from gitlab-org/gitlab@master 2019-12-03 18:06:49 +00:00
GitLab Bot b38cf7ccdf Add latest changes from gitlab-org/gitlab@master 2019-10-01 00:06:42 +00:00
Peter Leitzen 7b87ed1499 Cleanup usages of `JSON.parse` in specs
Prefer `json_response` where applicable.
2019-07-16 08:03:49 +00:00
Rémy Coutable 96080fce7d Merge branch '58583-confidential-mr-branch-backend' into 'master'
Support creating an MR/branch on a fork from an issue

See merge request gitlab-org/gitlab-ce!29831
2019-07-01 10:54:11 +00:00
Patrick Bajao 6b68acbfe9 Check if user can `update_issue` on project
If user can update an issue under the specified confidential
issue project, should be able to find the project.
2019-07-01 16:23:26 +08:00
Patrick Bajao 1ca5520bd6 Fix issues when creating system notes
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.
2019-06-29 00:22:09 +08:00
Patrick Bajao ac3de494bd Support branch creation from confidential issue
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.
2019-06-29 00:22:09 +08:00
Igor Drozdov ca5cd7b7fb Add endpoint for fetching diverging commit counts
Extract diverging_commit_counts into a service class
2019-06-28 16:22:35 +03:00
James Fargher 6b9157d5dc Make KubernetesService readonly
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.
2019-06-18 00:01:56 +00:00
gfyoung 93a44e135b Add some frozen string to spec/**/*.rb
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
2019-04-15 10:17:05 +00:00
Sam Bigelow c607b35824 Use 'delete' instead of 'remove' for source branch
This is to match `git branch -D <branchname>`
2019-01-22 12:57:01 -05:00
blackst0ne b44a2c801a Update specs to rails5 format
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 }`
2018-12-19 10:04:31 +11:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Rémy Coutable 248cefc709
Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-24 19:29:29 +02:00
Lin Jen-Shin 78ea82c3e2 Re-enable allowing n+1 Gitaly calls for cold cache
Whenever cache is enabled and cold, branches index still makes
n+1 calls. Make sure we catch this.
2018-04-03 17:16:30 +08:00
Takuya Noguchi 580d895363 Add overview of branches and a filter for active/stale branches 2018-03-06 21:28:14 +09:00
Mateusz Bajorski 896b9a6828 Fix when branch creation fails don't post system note
Closes #24347
2017-12-26 19:29:54 +01:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Shinya Maeda c36d7842da Aling shared_exmaples to "same behavior between KubernetesService and Platform::Kubernetes" 2017-11-28 20:47:59 +09:00
Shinya Maeda 53da3d976f Replce kubernetes_service and deployment_service to deployment_platform 2017-11-28 20:47:59 +09:00
Shinya Maeda 1d7e3ef1a5 Duplicate spec for Platform::Kubernetes with kubernetes_project 2017-11-28 20:47:59 +09:00
Shinya Maeda 45f2d0af41 Add test suit for platform::kubernetes 2017-11-28 20:47:59 +09:00
Jacopo 2f40dac352 Refactor `have_http_status` into `have_gitlab_http_status` in the specs 2017-10-20 10:13:18 +02:00
Andrew Newdigate 47d19c2de1 Stop using `branch_names.include?` and use `branch_exists?` 2017-10-10 14:56:04 +00:00
Micael Bergeron a31e0aff22 Resolve "Error 500 in non-UTF8 branch names" 2017-09-12 14:07:31 +00:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Gabriel Mazetto abb878326c Rename many path_with_namespace -> full_path 2017-08-01 07:26:58 +02:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Douwe Maan b38c74d696 Revert 'New file from interface on existing branch' 2017-06-09 10:10:47 -05:00
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Alfredo Sumaran b64a37c4ed Allow to create new branch and empty WIP merge request from issue page 2017-05-04 08:09:21 +00:00
Jacopo e0fe2834eb New file from interface on existing branch
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.
2017-03-13 16:36:11 +01:00
George Andrinopoulos 905a2993e9 Fix json response in branches controller 2017-03-06 11:48:40 +02:00