Commit Graph

45 Commits

Author SHA1 Message Date
GitLab Bot 43a25d93eb Add latest changes from gitlab-org/gitlab@16-0-stable-ee 2023-05-17 16:05:49 +00:00
GitLab Bot 05f0ebba3a Add latest changes from gitlab-org/gitlab@15-8-stable-ee 2023-01-18 19:00:14 +00:00
GitLab Bot b9b8440df6 Add latest changes from gitlab-org/security/gitlab@15-7-stable-ee 2023-01-06 22:30:24 +00:00
GitLab Bot b39512ed75 Add latest changes from gitlab-org/gitlab@15-3-stable-ee 2022-08-18 08:17:02 +00:00
GitLab Bot 3cccd102ba Add latest changes from gitlab-org/gitlab@14-10-stable-ee 2022-04-20 10:00:54 +00:00
GitLab Bot 41fe97390c Add latest changes from gitlab-org/gitlab@14-9-stable-ee 2022-03-18 20:02:30 +00:00
GitLab Bot d9ab72d608 Add latest changes from gitlab-org/gitlab@14-4-stable-ee 2021-10-20 08:43:02 +00:00
GitLab Bot 6f10ecdeb6 Add latest changes from gitlab-org/security/gitlab@14-3-stable-ee 2021-09-29 13:02:17 +00:00
GitLab Bot 4555e1b21c Add latest changes from gitlab-org/gitlab@13-12-stable-ee 2021-05-19 15:44:42 +00:00
GitLab Bot 8b573c9489 Add latest changes from gitlab-org/gitlab@13-7-stable-ee 2020-12-17 11:59:07 +00:00
GitLab Bot 48aff82709 Add latest changes from gitlab-org/gitlab@13-5-stable-ee 2020-10-21 07:08:36 +00:00
GitLab Bot 5049b3cd23 Add latest changes from gitlab-org/gitlab@13-4-stable-ee 2020-10-05 17:33:30 +00:00
GitLab Bot 5ad0cf2655 Add latest changes from gitlab-org/gitlab@master 2020-01-23 12:08:38 +00:00
GitLab Bot 4f05a63095 Add latest changes from gitlab-org/gitlab@master 2019-11-28 18:06:11 +00:00
GitLab Bot 69944ffb68 Add latest changes from gitlab-org/gitlab@master 2019-11-12 15:06:26 +00:00
GitLab Bot ae72d71da8 Add latest changes from gitlab-org/gitlab@master 2019-11-08 21:06:38 +00:00
GitLab Bot 1adb4373ba Add latest changes from gitlab-org/gitlab@master 2019-11-08 00:05:58 +00:00
GitLab Bot d8ccc7a00b Add latest changes from gitlab-org/gitlab@master 2019-11-07 18:06:21 +00:00
GitLab Bot 429d1abad2 Add latest changes from gitlab-org/gitlab@master 2019-10-14 15:06:07 +00:00
Jan Provaznik 41d52bbfe9 Add direct upload support for personal snippets 2019-08-23 11:19:14 +02: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
Sean McGivern 79dd92c818 Optimise upload path calls
String#underscore isn't particularly slow, but it's possible for us to
call it many times in a users autocomplete request, with mostly-static
values ('User', 'Group', etc.). We can memoise this and save a
surprising amount of time (around 10% of the total request time in some
cases).
2019-05-14 11:01:48 -05:00
Sean McGivern c1892f6c90 Remove the `comment_personal_snippet` permission
This is now entirely handled by `create_note`:

1. Project snippets prevent `create_note`.
2. Uploads already only support routing for personal snippets.

This simplifies some policies and access checks, too!
2019-05-02 11:13:42 +01:00
Andrew Newdigate 3288e1a874 Adds the Rubocop ReturnNil cop
This style change enforces `return if ...` instead of
`return nil if ...` to save maintainers a few minor review points
2019-03-06 17:51:56 +02:00
Tim Zallmann 2d057da183 Turned cache_privately? into cache_publicly?
Also removed unnecessary comment
2019-01-22 12:34:11 +01:00
Tim Zallmann 86cda964cf Fixed static analysis error and 2 caching specs 2019-01-21 23:58:54 +01:00
Tim Zallmann 5fc63a1d23 Changed the Caching of User Avatars to be public and to 5 minutes 2019-01-21 22:25:54 +01:00
gfyoung 73322a0e55 Enable frozen string in app/controllers/**/*.rb
Enables frozen string for the following:

* app/controllers/*.rb
* app/controllers/admin/**/*.rb
* app/controllers/boards/**/*.rb
* app/controllers/ci/**/*.rb
* app/controllers/concerns/**/*.rb

Partially addresses #47424.
2018-09-18 21:22:45 -07:00
Micaël Bergeron 2057a6acde port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
Robert Speicher 260c8da060 Whitelist or fix additional `Gitlab/PublicSend` cop violations
An upcoming update to rubocop-gitlab-security added additional
violations.
2017-08-14 12:14:11 -04:00
Jarka Kadlecova 2e311d9d1a Support uploads for newly created personal snippets 2017-06-07 07:52:41 +02:00
Jarka Kadlecova 4464c22d6d Support descriptions for snippets 2017-05-31 07:17:03 +02:00
Alexis Reigel 9a15b11237 Fixes the 500 for custom apearance header logo and logo 2017-05-19 09:20:51 +00:00
Jarka Kadlecova 43ff738641 Support uploaders for personal snippets comments 2017-05-02 15:22:24 +02:00
Pawel Chojnacki f7cd5fd79a Ensure mutable uploads are not cached without revalidation 2017-02-22 20:34:23 +01:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
2016-02-26 15:50:51 +01:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Douwe Maan 783b286ac0 Don't symbolize params. 2015-05-11 11:55:02 +02:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Douwe Maan f5e42f602f Reject access to group/project avatar if the user doesn't have access. 2015-03-10 17:13:02 +01:00
Dmitriy Zaporozhets 16e899ca8b Add brakeman rake task and improve code security 2015-03-02 18:11:50 -08:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
Dmitriy Zaporozhets 897a2de54c Allow non authenticated access to avatars 2015-02-23 19:35:42 -08:00
Douwe Maan 218283b368 Merge branch 'extend_markdown_upload' into generic-uploads
# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb
2015-02-20 15:37:37 +01:00
Douwe Maan 00ca490259 Use controllers to serve uploads, with XSS prevention and access control. 2015-02-20 13:13:48 +01:00