Commit Graph

132 Commits

Author SHA1 Message Date
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
Douwe Maan 869668c9cf Add render_error to blob JSON 2017-08-03 16:36:04 +02:00
Douwe Maan f711b2df8b Clean up some backend 2017-08-03 14:29:35 +02:00
Luke "Jared" Bennett 933cfe1e0c
Add environment instance var to BlobController#show html resp 2017-07-31 17:04:30 +01:00
Luke "Jared" Bennett 2a6f1b32dd
render blob/show if not show_new_repo? 2017-07-28 19:40:12 +01:00
Luke "Jared" Bennett 6448368b5b
Merge remote-tracking branch 'origin/master' into ide 2017-07-20 17:51:07 +01:00
Jacob Schatz 62ad011340 Get single view working. 2017-07-10 23:22:21 -04: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
Douwe Maan b38c74d696 Revert 'New file from interface on existing branch' 2017-06-09 10:10:47 -05:00
Douwe Maan e6e29f9220 Use Diff::File blob methods from diff highlighter 2017-06-08 09:39:54 -05:00
Douwe Maan dbffaaa97e Blob#load_all_data! doesn’t need an argument 2017-06-07 14:28:33 -05:00
Douwe Maan aed0387f97 Consistent diff and blob size limit names 2017-05-29 17:02:02 -05:00
Douwe Maan d3b24a7638 Show last commit for current tree on tree page 2017-05-17 20:59:26 +03:00
Douwe Maan 60ebd101d0 Use blob viewers for snippets 2017-04-30 11:21:20 -05:00
Douwe Maan 0e0c760e48 Refactor overriding max size 2017-04-27 12:23:26 -05:00
Douwe Maan 121c5f6618 Add JSON endpoint to get simple blob viewer 2017-04-27 12:23:26 -05:00
Douwe Maan 7f625f06d3 Pass project to Blob 2017-04-27 12:23:26 -05:00
Douwe Maan d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00