Commit Graph

173 Commits

Author SHA1 Message Date
GitLab Bot 454973238c Add latest changes from gitlab-org/gitlab@master 2021-05-06 21:10:07 +00:00
GitLab Bot 0a5ea888dc Add latest changes from gitlab-org/gitlab@master 2021-05-06 15:10:17 +00:00
GitLab Bot 5f5f492fe2 Add latest changes from gitlab-org/gitlab@master 2021-04-22 15:09:56 +00:00
GitLab Bot b81fd57f3d Add latest changes from gitlab-org/gitlab@master 2021-04-22 09:09:45 +00:00
GitLab Bot dc7cd84a3e Add latest changes from gitlab-org/gitlab@master 2021-04-07 09:09:06 +00:00
GitLab Bot 15714832c8 Add latest changes from gitlab-org/gitlab@master 2021-02-18 15:09:43 +00:00
GitLab Bot 5231344d99 Add latest changes from gitlab-org/gitlab@master 2021-02-11 15:09:11 +00:00
GitLab Bot 43678813e8 Add latest changes from gitlab-org/gitlab@master 2020-12-17 21:09:57 +00:00
GitLab Bot 518aebfe14 Add latest changes from gitlab-org/gitlab@master 2020-11-29 09:09:27 +00:00
GitLab Bot 7a84f32e22 Add latest changes from gitlab-org/gitlab@master 2020-11-20 00:09:06 +00:00
GitLab Bot 5fcb5ff2d6 Add latest changes from gitlab-org/gitlab@master 2020-10-27 06:08:27 +00:00
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18:08:32 +00:00
GitLab Bot 15229b03e0 Add latest changes from gitlab-org/gitlab@master 2020-09-30 21:10:09 +00:00
GitLab Bot 20fda899a6 Add latest changes from gitlab-org/gitlab@master 2020-09-29 15:10:08 +00:00
GitLab Bot 591b0e86e3 Add latest changes from gitlab-org/gitlab@master 2020-09-16 12:10:15 +00:00
GitLab Bot 9afe9ca576 Add latest changes from gitlab-org/gitlab@master 2020-09-10 15:09:10 +00:00
GitLab Bot 73add99b1f Add latest changes from gitlab-org/gitlab@master 2020-09-09 09:08:40 +00:00
GitLab Bot 40024efc70 Add latest changes from gitlab-org/gitlab@master 2020-09-03 12:08:47 +00:00
GitLab Bot 448ff1fb83 Add latest changes from gitlab-org/gitlab@master 2020-07-22 03:09:40 +00:00
GitLab Bot 207ec5c078 Add latest changes from gitlab-org/gitlab@master 2020-07-12 09:09:08 +00:00
GitLab Bot 2f147005c5 Add latest changes from gitlab-org/gitlab@master 2020-07-11 00:09:17 +00:00
GitLab Bot a0b26c6df5 Add latest changes from gitlab-org/gitlab@master 2020-06-29 12:09:20 +00:00
GitLab Bot 757d2fda7e Add latest changes from gitlab-org/gitlab@master 2020-06-26 21:08:51 +00:00
GitLab Bot 1127990db8 Add latest changes from gitlab-org/gitlab@master 2020-06-22 03:08:17 +00:00
GitLab Bot 0cc7fe66f5 Add latest changes from gitlab-org/gitlab@master 2020-06-11 18:08:28 +00:00
GitLab Bot 27c6c4bf06 Add latest changes from gitlab-org/gitlab@master 2020-05-26 09:08:06 +00:00
GitLab Bot 76784ebd4a Add latest changes from gitlab-org/gitlab@master 2020-05-26 03:08:02 +00:00
GitLab Bot ade18c9d68 Add latest changes from gitlab-org/gitlab@master 2020-04-02 09:08:14 +00:00
GitLab Bot 603c7d4cac Add latest changes from gitlab-org/gitlab@master 2020-03-24 18:07:55 +00:00
GitLab Bot 7671216b60 Add latest changes from gitlab-org/gitlab@master 2020-02-24 21:09:08 +00:00
GitLab Bot 5564275a0b Add latest changes from gitlab-org/gitlab@master 2020-02-06 12:10:29 +00:00
GitLab Bot f6e985dba4 Add latest changes from gitlab-org/gitlab@master 2020-01-08 06:08:13 +00:00
GitLab Bot bbe2430603 Add latest changes from gitlab-org/gitlab@master 2019-12-18 18:08:04 +00:00
GitLab Bot eca3cd3a9e Add latest changes from gitlab-org/gitlab@master 2019-11-15 18:06:24 +00:00
GitLab Bot f1bb2a307e Add latest changes from gitlab-org/gitlab@master 2019-10-21 18:06:29 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Peter Leitzen 6767326267 Use ActiveModel's type instead of virtus
The virtus project has been discontinued:

https://github.com/solnic/virtus/commit/a6f896984
2019-08-20 10:52:21 +00:00
Stan Hu 0d8e9f6ee3 Expand FindCommit caching to blob and refs
This enables FindCommit caching to the following actions:

* BlobController#show
* RefsController#logs_tree

It also improves caching in CommitsController since some
duplicate requests were occuring inside the before_action
definitions.
2019-04-06 05:16:22 -07:00
Bob Van Landuyt 8c5b3d0302 Allow streaming io objects into Gitaly
This allows us to set the encoding of an IO passed without reading it
into memory.

This is useful if we want to stream files into Gitaly. Like we do when
uploading a new file to the repository.
2019-04-01 20:17:40 +02:00
Martin Wortschack 5660690787 Externalize strings in projects controllers
- concerns
- dashboard
- groups
- import
2019-03-27 16:52:52 +00:00
Mark Chao cea59dbe03 Move diff_line preparation into presenter
Update spec
2019-03-07 16:12:36 +08:00
Mark Chao 2609c2a73e Fix spec description and outdated comments 2019-03-06 15:51:22 +08:00
Mark Chao 90527b9f84 Add full option for blob diff action
Returns all diff lines for frontend if full is true.
Turn UnfoldForm into presenter, and move controller logic to presenter.
2019-03-06 15:50:55 +08:00
Jasper Maes 30e2a8f08c Fix several ActionController::Parameters deprecations 2019-01-11 21:19:01 +01:00
Francisco Javier López 5a3e6fdff9
Fixing image lfs bug and also displaying text lfs
This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812,
fixes a problem creating a displaying image diff notes when the image
is stored in LFS. The main problem was that `Gitlab::Diff::File` was
returning an invalid valid in `text?` for this kind of files.

It also fixes a rendering problem with other LFS files, like text
ones. They LFS pointer shouldn't be shown when LFS is enabled
for the project, but they were.
2018-12-27 16:51:07 +01:00
Douwe Maan 76bc2f0874
Revert "[Rails5] Explicitly set request.format for blob_controller"
This reverts commit 037334d2f2.

# Conflicts:
#	app/controllers/projects/blob_controller.rb
2018-12-03 12:29:01 +01:00
Jasper Maes 6ffdab63c5 render :nothing option is deprecated, Use head method to respond with empty response body. 2018-11-23 10:56:14 +01:00
Oswaldo Ferreira 6c796702a4 Remove 'comment_on_any_diff_line' feature flag 2018-11-14 19:22:49 -02:00
Oswaldo Ferreira f9b4130bb7 Comment on any expanded diff line on MRs 2018-11-09 16:56:48 -02:00
Oswaldo Ferreira 198402b38b Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
This reverts commit a82a595728, reversing
changes made to e7df959b8f.
2018-11-07 19:57:26 -02:00