Commit Graph

60 Commits

Author SHA1 Message Date
GitLab Bot 760ddae438 Add latest changes from gitlab-org/gitlab@master 2023-10-06 06:09:15 +00:00
GitLab Bot d2199d7493 Add latest changes from gitlab-org/gitlab@master 2022-03-16 12:07:24 +00:00
GitLab Bot 2000704b7a Add latest changes from gitlab-org/gitlab@master 2021-08-11 06:10:02 +00:00
GitLab Bot 5231344d99 Add latest changes from gitlab-org/gitlab@master 2021-02-11 15:09:11 +00:00
GitLab Bot 94c1ea6190 Add latest changes from gitlab-org/gitlab@master 2020-11-24 15:09:13 +00:00
GitLab Bot bde2d0d618 Add latest changes from gitlab-org/gitlab@master 2020-10-23 06:08:51 +00:00
GitLab Bot 316fbf9f95 Add latest changes from gitlab-org/gitlab@master 2020-10-15 18:08:43 +00:00
GitLab Bot b17f0b91a6 Add latest changes from gitlab-org/gitlab@master 2020-10-12 15:08:32 +00:00
GitLab Bot f2eb66fef8 Add latest changes from gitlab-org/gitlab@master 2020-08-21 03:10:16 +00:00
GitLab Bot 0bc6d00165 Add latest changes from gitlab-org/gitlab@master 2020-07-10 18:09:45 +00:00
GitLab Bot 8b0ef13236 Add latest changes from gitlab-org/gitlab@master 2020-06-03 18:08:28 +00:00
GitLab Bot 7e5f8d0881 Add latest changes from gitlab-org/gitlab@master 2020-05-18 06:08:14 +00:00
GitLab Bot fdd0b0fd45 Add latest changes from gitlab-org/gitlab@master 2020-04-23 18:09:46 +00:00
GitLab Bot f1d9023a90 Add latest changes from gitlab-org/gitlab@master 2020-04-21 18:09:31 +00:00
GitLab Bot abae8f34f3 Add latest changes from gitlab-org/gitlab@master 2020-03-31 21:08:05 +00:00
GitLab Bot 580622bdb3 Add latest changes from gitlab-org/gitlab@master 2020-03-31 18:07:42 +00:00
GitLab Bot 2c72daf2f1 Add latest changes from gitlab-org/gitlab@master 2020-03-30 18:08:07 +00:00
GitLab Bot 2fd92f2dc7 Add latest changes from gitlab-org/gitlab@master 2020-03-04 21:07:54 +00:00
GitLab Bot b98fa9ef3d Add latest changes from gitlab-org/gitlab@master 2020-02-25 09:09:10 +00:00
GitLab Bot 536aa3a1f4 Add latest changes from gitlab-org/gitlab@master 2020-01-30 15:09:15 +00:00
GitLab Bot 22e9af3c8b Add latest changes from gitlab-org/gitlab@master 2020-01-27 12:08:35 +00:00
GitLab Bot efb0c7f501 Add latest changes from gitlab-org/gitlab@master 2020-01-17 00:09:00 +00:00
GitLab Bot 839c080dd0 Add latest changes from gitlab-org/gitlab@master 2019-11-29 21:06:13 +00:00
GitLab Bot 90a06a20be Add latest changes from gitlab-org/gitlab@master 2019-11-07 15:06:33 +00:00
GitLab Bot 7bb7a8d529 Add latest changes from gitlab-org/gitlab@master 2019-09-25 03:06:21 +00:00
Markus Koller f1926b321d
Add controller concern for paginated collections
We had similar code in a few places to redirect to the last page if
the given page number is out of range. This unifies the handling in a
new controller concern and adds usage of it in all snippet listings.
2019-09-10 15:24:29 +02:00
Peter Leitzen 7b87ed1499 Cleanup usages of `JSON.parse` in specs
Prefer `json_response` where applicable.
2019-07-16 08:03:49 +00:00
Oswaldo Ferreira 44e1915d4f Persist tmp snippet uploads
It persist temporary personal snippets under
user/:id namespaces temporarily while creating
a upload record to track it. If an user gets removed
while it's still a tmp upload, it also gets removed.
If the tmp upload is sent, the upload gets moved to
personal_snippets/:id as before. The upload record
also gets updated to the new model type as well.
2019-06-17 11:25:40 -03: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
Mark Chao d72b1cd0b5 Check snippet attached file to be moved is within designated directory
Previously one could move any temp/ sub folder around.
2019-02-21 16:44:44 +08:00
Jasper Maes d53755da68 Fix deprecation: Using positional arguments in integration tests 2019-01-02 22:33:28 +01:00
John Jarvis 8f461ef779 Merge branch 'security-48259-private-snippet' into 'master'
[master] Prevent private snippet from being embeddable

See merge request gitlab/gitlabhq!2692
2019-01-01 20:38:30 +00:00
Mark Chao ed0d691e0d Block private snippets from being embeddable 2018-12-20 14:32:51 +08:00
Francisco Javier López 33e5955671
Removing workhorse_set_content_type feature flag
Removing workhorse_set_content_type feature flag introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22667
2018-12-19 13:05:44 +01: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
Francisco Javier López cf8b8ff99b Add feature flag for workhorse content type calculation 2018-12-06 21:22:39 +00:00
Jacopo 2f40dac352 Refactor `have_http_status` into `have_gitlab_http_status` in the specs 2017-10-20 10:13:18 +02:00
Maxim Rydkin fa030cbc85 replace `is_spam?` with `spam?` 2017-08-29 11:14:42 +03:00
Bob Van Landuyt 180de2d201 Make sure uploads for personal snippets are correctly rendered 2017-08-11 18:15:02 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Robert Speicher 9513bd18c4 Ensure all project factories use `:repository` trait or `:empty_project` 2017-08-01 14:51:52 -04:00
Sean McGivern 88df076fae Merge branch '33359-pers-snippet-files-location' into 'security-9-3'
Use uploads/system directory for personal snippets

See merge request !2123
2017-07-19 22:28:27 -05: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
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Jarka Kadlecova 4464c22d6d Support descriptions for snippets 2017-05-31 07:17:03 +02:00
Douwe Maan ad309f5d11 Merge branch 'snippets-finder-visibility' into 'security'
Refactor snippets finder & dont return internal snippets for external users

See merge request !2094
2017-05-10 16:48:18 +02:00
Sean McGivern d9ec830a83 Merge branch 'snippets_visibility' into 'security'
Fix snippets visibility for show action - external users can not see internal snippets

See merge request !2087
2017-05-10 16:44:20 +02:00
Douwe Maan 2b3fc5e624 Add download button to project snippets 2017-04-30 17:52:49 -05:00
Jarka Kadlecova 87327c5845 Support preview_markdown action for personal_snippets 2017-04-26 12:51:06 +02:00