Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-07-11 | 1 | -1/+1 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-06-29 | 1 | -1/+1 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-06-26 | 1 | -1/+1 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-06-22 | 1 | -1/+1 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-06-11 | 1 | -1/+0 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-05-26 | 1 | -14/+3 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-05-26 | 1 | -0/+16 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-04-02 | 1 | -13/+1 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-24 | 1 | -0/+13 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-24 | 1 | -0/+1 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-06 | 1 | -0/+4 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-08 | 1 | -1/+1 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-18 | 1 | -0/+1 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-15 | 1 | -0/+2 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-21 | 1 | -1/+2 | |
| | ||||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-18 | 1 | -1/+1 | |
| | ||||||
* | Use ActiveModel's type instead of virtus | Peter Leitzen | 2019-08-20 | 1 | -1/+5 | |
| | | | | | | The virtus project has been discontinued: https://github.com/solnic/virtus/commit/a6f896984 | |||||
* | Expand FindCommit caching to blob and refssh-improve-find-commit-caching | Stan Hu | 2019-04-06 | 1 | -0/+2 | |
| | | | | | | | | | | | 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. | |||||
* | Allow streaming io objects into Gitaly | Bob Van Landuyt | 2019-04-01 | 1 | -2/+1 | |
| | | | | | | | | 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. | |||||
* | Externalize strings in projects controllers | Martin Wortschack | 2019-03-27 | 1 | -2/+2 | |
| | | | | | | | - concerns - dashboard - groups - import | |||||
* | Move diff_line preparation into presenter | Mark Chao | 2019-03-07 | 1 | -35/+4 | |
| | | | | Update spec | |||||
* | Fix spec description and outdated comments | Mark Chao | 2019-03-06 | 1 | -2/+0 | |
| | ||||||
* | Add full option for blob diff action | Mark Chao | 2019-03-06 | 1 | -14/+5 | |
| | | | | Returns all diff lines for frontend if full is true. Turn UnfoldForm into presenter, and move controller logic to presenter. | |||||
* | Fix several ActionController::Parameters deprecations | Jasper Maes | 2019-01-11 | 1 | -1/+1 | |
| | ||||||
* | Fixing image lfs bug and also displaying text lfs | Francisco Javier López | 2018-12-27 | 1 | -1/+1 | |
| | | | | | | | | | | | 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. | |||||
* | Revert "[Rails5] Explicitly set request.format for blob_controller" | Douwe Maan | 2018-12-03 | 1 | -13/+0 | |
| | | | | | | | This reverts commit 037334d2f29fbb14d5e366a7b892a75631eb9ace. # Conflicts: # app/controllers/projects/blob_controller.rb | |||||
* | render :nothing option is deprecated, Use head method to respond with empty ↵ | Jasper Maes | 2018-11-23 | 1 | -1/+1 | |
| | | | | response body. | |||||
* | Remove 'comment_on_any_diff_line' feature flagosw-remove-comment-on-any-diff-line-ff | Oswaldo Ferreira | 2018-11-14 | 1 | -6/+1 | |
| | ||||||
* | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flag | Oswaldo Ferreira | 2018-11-09 | 1 | -1/+6 | |
| | ||||||
* | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-line | Oswaldo Ferreira | 2018-11-07 | 1 | -1/+1 | |
| | | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e. | |||||
* | Merge branch 'osw-comment-on-any-line-on-diffs' into 'master' | Douwe Maan | 2018-11-07 | 1 | -1/+1 | |
|\ | | | | | | | | | Comment on any expanded diff line on MRs See merge request gitlab-org/gitlab-ce!22398 | |||||
| * | Comment on any expanded diff line on MRs | Oswaldo Ferreira | 2018-11-06 | 1 | -1/+1 | |
| | | ||||||
* | | Make Highlight accept language param | Mark Chao | 2018-10-30 | 1 | -1/+1 | |
|/ | | | | | | | | | | 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. | |||||
* | Rails5: fix delete blob | Jasper Maes | 2018-10-18 | 1 | -1/+1 | |
| | ||||||
* | Resolve "In web editor, when delete a file, should navigate to enclosing ↵ | George Thomas | 2018-10-17 | 1 | -4/+14 | |
| | | | | directory" | |||||
* | Enable even more frozen string in app/controllers | gfyoung | 2018-09-25 | 1 | -0/+2 | |
| | | | | | | | | | | | | 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. | |||||
* | Disable existing offenses for the CodeReuse cops | Yorick Peterse | 2018-09-11 | 1 | -0/+2 | |
| | | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop. | |||||
* | Use a serializer to render diff lines | Felipe Artur | 2018-08-31 | 1 | -1/+1 | |
| | ||||||
* | Changes tab VUE refactoring | Felipe Artur | 2018-06-21 | 1 | -2/+42 | |
| | ||||||
* | Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master' | Rémy Coutable | 2018-06-18 | 1 | -0/+13 | |
|\ | | | | | | | | | | | | | [Rails5] Explicitly set request.format for blob_controller Closes #47921 See merge request gitlab-org/gitlab-ce!19876 | |||||
| * | [Rails5] Explicitly set request.format for blob_controllerblackst0ne-rails5-fix-blob-requests-format | blackst0ne | 2018-06-15 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | only return last_commit_sha in the JSONide-add-last-commit-id-to-api-call | Phil Hughes | 2018-06-15 | 1 | -2/+2 | |
| | | ||||||
* | | IDE sends last commit ID when committing changes | Phil Hughes | 2018-06-15 | 1 | -0/+2 | |
| | | | | | | | | Closes #46192 | |||||
* | | Reuse viewer param and move logic to blob controller | Douwe Maan | 2018-06-15 | 1 | -5/+6 | |
|/ | ||||||
* | Allow maintainers to edit directly in a fork | Bob Van Landuyt | 2018-03-07 | 1 | -2/+6 | |
| | ||||||
* | Replace deprecated name_with_namespace with full_name in app and spec | Dmitriy Zaporozhets | 2018-03-05 | 1 | -1/+1 | |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Port `read_cross_project` ability from EE | Bob Van Landuyt | 2018-02-22 | 1 | -1/+1 | |
| | ||||||
* | Adds Rubocop rule for line break around conditionals | 🙈 jacopo beschi 🙉 | 2018-01-11 | 1 | -0/+1 | |
| | ||||||
* | Remove a redundant `InvalidPathError` definitionrs-remove-useless-definition | Robert Speicher | 2017-12-20 | 1 | -5/+0 | |
| | | | | | This is already defined in `ExtractsPath`, which this controller includes. | |||||
* | fixed bug with tabs not switching correctly | Phil Hughes | 2017-10-23 | 1 | -0/+1 | |
| | | | | clears all tmp files after cancelling edit mode |