Commit Graph

78 Commits

Author SHA1 Message Date
GitLab Bot 5d076c940c Add latest changes from gitlab-org/gitlab@master 2025-05-08 18:13:15 +00:00
GitLab Bot 61066c990c Add latest changes from gitlab-org/gitlab@master 2025-04-16 21:09:42 +00:00
GitLab Bot c83db9983a Add latest changes from gitlab-org/gitlab@master 2025-03-17 12:07:29 +00:00
GitLab Bot 2e83d966ac Add latest changes from gitlab-org/gitlab@master 2024-04-11 12:13:44 +00:00
GitLab Bot 5d7b3c05e5 Add latest changes from gitlab-org/gitlab@master 2023-04-18 09:15:50 +00:00
GitLab Bot 62798ed33c Add latest changes from gitlab-org/gitlab@master 2023-04-13 09:11:23 +00:00
GitLab Bot f0224e32ca Add latest changes from gitlab-org/gitlab@master 2023-03-29 06:08:39 +00:00
GitLab Bot 8856bb563b Add latest changes from gitlab-org/gitlab@master 2023-03-24 09:08:17 +00:00
GitLab Bot cc93153f08 Add latest changes from gitlab-org/gitlab@master 2023-03-24 06:08:33 +00:00
GitLab Bot 0cee6f1577 Add latest changes from gitlab-org/gitlab@master 2023-01-19 03:07:38 +00:00
GitLab Bot 5fe2d74e00 Add latest changes from gitlab-org/gitlab@master 2022-12-09 09:08:55 +00:00
GitLab Bot 16776d7f4f Add latest changes from gitlab-org/gitlab@master 2022-10-31 21:11:07 +00:00
GitLab Bot 535401c636 Add latest changes from gitlab-org/gitlab@master 2022-08-22 09:11:23 +00:00
GitLab Bot b131b6f680 Add latest changes from gitlab-org/gitlab@master 2022-03-11 03:08:14 +00:00
GitLab Bot 2c90b9b579 Add latest changes from gitlab-org/gitlab@master 2021-11-16 09:13:21 +00:00
GitLab Bot e1e58fabfa Add latest changes from gitlab-org/gitlab@master 2021-07-07 15:07:24 +00:00
GitLab Bot 9c72b346ac Add latest changes from gitlab-org/gitlab@master 2020-10-15 09:08:41 +00:00
GitLab Bot 1850d48925 Add latest changes from gitlab-org/gitlab@master 2020-10-07 18:08:34 +00:00
GitLab Bot 1ca6880aac Add latest changes from gitlab-org/gitlab@master 2020-10-06 18:08:49 +00:00
GitLab Bot 497d517e13 Add latest changes from gitlab-org/gitlab@master 2020-10-06 09:08:32 +00:00
GitLab Bot d022b7432e Add latest changes from gitlab-org/gitlab@master 2020-09-09 12:08:22 +00:00
GitLab Bot a0158b1a9c Add latest changes from gitlab-org/gitlab@master 2020-09-08 12:08:41 +00:00
GitLab Bot 304e230182 Add latest changes from gitlab-org/gitlab@master 2020-09-01 18:10:48 +00:00
GitLab Bot 71da5de44f Add latest changes from gitlab-org/gitlab@master 2020-08-05 15:09:59 +00:00
GitLab Bot fcda041fc0 Add latest changes from gitlab-org/gitlab@master 2020-07-09 12:08:56 +00:00
GitLab Bot ae1efa2e1d Add latest changes from gitlab-org/gitlab@master 2020-07-01 15:08:45 +00:00
GitLab Bot fa7ac2663b Add latest changes from gitlab-org/gitlab@master 2020-06-24 06:09:01 +00:00
GitLab Bot 553a22402b Add latest changes from gitlab-org/gitlab@master 2020-05-19 12:08:21 +00:00
GitLab Bot 48650fe1bf Add latest changes from gitlab-org/gitlab@master 2020-05-18 12:08:08 +00:00
GitLab Bot 39a548dd06 Add latest changes from gitlab-org/gitlab@master 2020-05-04 15:09:38 +00:00
GitLab Bot fdd0b0fd45 Add latest changes from gitlab-org/gitlab@master 2020-04-23 18:09:46 +00:00
GitLab Bot e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot 1219a9dce9 Add latest changes from gitlab-org/gitlab@master 2020-04-01 15:07:45 +00:00
GitLab Bot dc003cd08b Add latest changes from gitlab-org/gitlab@master 2020-03-26 18:08:03 +00:00
GitLab Bot 2af90cef2e Add latest changes from gitlab-org/gitlab@master 2020-03-19 09:09:27 +00:00
GitLab Bot d3fc3be040 Add latest changes from gitlab-org/gitlab@master 2020-03-04 15:08:09 +00:00
GitLab Bot e9c2bf2678 Add latest changes from gitlab-org/gitlab@master 2020-03-03 18:08:16 +00:00
GitLab Bot 1c8fa70f9d Add latest changes from gitlab-org/gitlab@master 2020-02-28 18:09:07 +00:00
GitLab Bot c77fda905a Add latest changes from gitlab-org/gitlab@master 2020-02-27 21:09:17 +00:00
GitLab Bot b304a72312 Add latest changes from gitlab-org/gitlab@master 2020-02-17 15:09:01 +00:00
GitLab Bot 536aa3a1f4 Add latest changes from gitlab-org/gitlab@master 2020-01-30 15:09:15 +00:00
GitLab Bot d10a462fed Add latest changes from gitlab-org/gitlab@master 2019-12-16 12:07:43 +00:00
GitLab Bot abfafe3c57 Add latest changes from gitlab-org/gitlab@master 2019-10-29 00:06:10 +00:00
GitLab Bot 7bb7a8d529 Add latest changes from gitlab-org/gitlab@master 2019-09-25 03:06:21 +00:00
Grzegorz Bizon 1068ec2e92 Merge branch '66741-remove-spec-rails_helper-rb' into 'master'
Remove spec/rails_helper.rb

Closes #66741

See merge request gitlab-org/gitlab-ce!32380
2019-09-03 13:48:17 +00:00
Ash McKenzie 19ff9d9899
Replace rails_helper.rb with spec_helper.rb
rails_helper.rb's only logic was to require
spec_helper.rb.
2019-08-30 12:26:18 +10:00
Rémy Coutable 1843502ff4 Merge branch 'sh-fix-snippet-visibility-api' into 'master'
Fix snippets API not working with visibility level

Closes #66050

See merge request gitlab-org/gitlab-ce!32286
2019-08-29 13:57:26 +00:00
Stan Hu fc52421b55 Standardize use of `content` parameter in snippets API
There was some confusion over whether `code` or `content` is the right
parameter for snippets. Internally, the database stores
`content`. However:

1. Project snippets use `code`. `code` gets remapped in `content` in
`lib/api/project_snippets.rb`.

2. Personal snippets use `content`.

To unify these APIs, allow an alias of `content` to work for project
snippets.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66673
2019-08-28 22:54:07 -07:00
Stan Hu 680f437715 Fix snippets API not working with visibility level
When a restricted visibility level of `private` is set in the instance,
creating a snippet with the `visibility` level would always fail.
This happened because:

1. `params[:visibility]` was a string (e.g. "public")
2. `CreateSnippetService` and `UpdateSnippetService` only looked
   at `params[:visibility_level]`, which was `nil`.

To fix this, we:

1. Make `CreateSnippetService` look at the newly-built
   `snippet.visibility_level`, since the right value is assigned by the
   `VisibilityLevel#visibility=` method.
2. Modify `UpdateSnippetService` to handle both `visibility_level` and
`visibility` parameters.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66050
2019-08-28 22:49:58 -07: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