root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
103,866 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

150 Commits

Author SHA1 Message Date
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
Douwe Maan a82a595728 Merge branch 'osw-comment-on-any-line-on-diffs' into 'master' 
Comment on any expanded diff line on MRs

See merge request gitlab-org/gitlab-ce!22398
 2018-11-07 11:56:46 +00:00
Oswaldo Ferreira ec66ef1b74 Comment on any expanded diff line on MRs 2018-11-06 17:39:31 -02:00
Mark Chao 39ae9a59a5 Make Highlight accept language param 
This replaces the repository param.
This allows more flexiblity as sometimes we have highlight content
not related to repository. Sometimes we know ahead of time the language
of the content. Lastly language determination seems better fit as a
logic in the Blob class.
`repository` param is only used to determine the language, which seems
to be the responsiblity of Blob.
 2018-10-30 15:44:55 +08:00
Jasper Maes b9565fe75b Rails5: fix delete blob 2018-10-18 18:08:26 +02:00
George Thomas 4a372af80b Resolve "In web editor, when delete a file, should navigate to enclosing directory" 2018-10-17 10:27:58 +00:00
gfyoung 12ee2753c1 Enable even more frozen string in app/controllers 
Enables frozen string for some vestigial files as
well as the following:

* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb

Partially addresses #47424.
 2018-09-25 22:43:49 -07:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops 
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
 2018-09-11 17:32:00 +02:00
Felipe Artur 5bc54ca425 Use a serializer to render diff lines 2018-08-31 15:32:48 -03:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Rémy Coutable b7700e0963 Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master' 
[Rails5] Explicitly set request.format for blob_controller

Closes #47921

See merge request gitlab-org/gitlab-ce!19876
 2018-06-18 08:56:12 +00:00
Phil Hughes 3530274b13
only return last_commit_sha in the JSON 2018-06-15 11:19:35 +01:00
Phil Hughes e906be2f68
IDE sends last commit ID when committing changes 
Closes #46192
 2018-06-15 11:18:48 +01:00
Douwe Maan fbc749a96e Reuse viewer param and move logic to blob controller 2018-06-15 09:42:56 +00:00
blackst0ne 037334d2f2 [Rails5] Explicitly set request.format for blob_controller 
In Rails 4.2 if params[:format] is empty, Rails set it to :html
But since Rails 5.0 the framework now looks for an extension.
E.g. for `blob/master/CHANGELOG.md` in Rails 4 the format would be
`:html`, but in Rails 5 on it'd be `:md`

This commit explicitly sets the `:html` format for all requests unless
`:format` is set by a client e.g. by JS for XHR requests.
 2018-06-15 16:00:20 +11:00
Bob Van Landuyt e74879280f Allow maintainers to edit directly in a fork 2018-03-07 16:55:34 +01:00
Dmitriy Zaporozhets 8fe9995f11
Replace deprecated name_with_namespace with full_name in app and spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-03-05 16:15:26 +02:00
Bob Van Landuyt 148816cd67 Port `read_cross_project` ability from EE 2018-02-22 17:11:36 +01:00
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
Robert Speicher 6552c36495 Remove a redundant `InvalidPathError` definition 
This is already defined in `ExtractsPath`, which this controller
includes.
 2017-12-20 16:02:36 -06:00
Phil Hughes 60ce5155c8
fixed bug with tabs not switching correctly 
clears all tmp files after cancelling edit mode
 2017-10-23 10:46:27 +01:00
Douwe Maan 711bb28568 Add Page-Title header to tree and blob JSON endpoints 2017-09-26 17:31:47 +02:00
Jacob Schatz 2024198da7 Many Repo Fixes 2017-08-15 19:53:41 +00:00
Luke "Jared" Bennett bbf2ef06eb
Fix ABC size of BlobController#show 2017-08-04 13:21:02 +01:00