summaryrefslogtreecommitdiff
path: root/app/controllers/projects/blob_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-071-1/+1
| | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
* Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'Douwe Maan2018-11-071-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 MRsOswaldo Ferreira2018-11-061-1/+1
| |
* | Make Highlight accept language paramMark Chao2018-10-301-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 blobJasper Maes2018-10-181-1/+1
|
* Resolve "In web editor, when delete a file, should navigate to enclosing ↵George Thomas2018-10-171-4/+14
| | | | directory"
* Enable even more frozen string in app/controllersgfyoung2018-09-251-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 copsYorick Peterse2018-09-111-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 linesFelipe Artur2018-08-311-1/+1
|
* Changes tab VUE refactoringFelipe Artur2018-06-211-2/+42
|
* Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'Rémy Coutable2018-06-181-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-formatblackst0ne2018-06-151-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-callPhil Hughes2018-06-151-2/+2
| |
* | IDE sends last commit ID when committing changesPhil Hughes2018-06-151-0/+2
| | | | | | | | Closes #46192
* | Reuse viewer param and move logic to blob controllerDouwe Maan2018-06-151-5/+6
|/
* Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-071-2/+6
|
* Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-051-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Port `read_cross_project` ability from EEBob Van Landuyt2018-02-221-1/+1
|
* Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
|
* Remove a redundant `InvalidPathError` definitionrs-remove-useless-definitionRobert Speicher2017-12-201-5/+0
| | | | | This is already defined in `ExtractsPath`, which this controller includes.
* fixed bug with tabs not switching correctlyPhil Hughes2017-10-231-0/+1
| | | | clears all tmp files after cancelling edit mode
* Add Page-Title header to tree and blob JSON endpointsDouwe Maan2017-09-261-0/+2
|
* Many Repo FixesJacob Schatz2017-08-151-0/+5
|
* Fix ABC size of BlobController#showLuke "Jared" Bennett2017-08-041-24/+32
|
* Add render_error to blob JSONDouwe Maan2017-08-031-1/+2
|
* Clean up some backendDouwe Maan2017-08-031-6/+20
|
* Add environment instance var to BlobController#show html respLuke "Jared" Bennett2017-07-311-0/+3
|
* render blob/show if not show_new_repo?Luke "Jared" Bennett2017-07-281-1/+2
|
* Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-201-8/+8
|\
| * Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-8/+8
| |
* | Get single view working.Jacob Schatz2017-07-101-5/+3
|/
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
|
* Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-091-2/+0
|
* Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-081-3/+5
|
* Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-071-3/+3
|
* Consistent diff and blob size limit namesDouwe Maan2017-05-291-1/+1
|
* Show last commit for current tree on tree pageDouwe Maan2017-05-171-0/+2
|
* Use blob viewers for snippetsDouwe Maan2017-04-301-1/+1
|
* Refactor overriding max sizeDouwe Maan2017-04-271-0/+2
|
* Add JSON endpoint to get simple blob viewerDouwe Maan2017-04-271-2/+13
|
* Pass project to BlobDouwe Maan2017-04-271-1/+1
|
* Refactor changing files in web UIDouwe Maan2017-04-201-9/+9
|
* Linking to edit file directlyEric Eastwood2017-04-061-2/+8
|
* New directory from interface on existing branchJacopo2017-03-211-5/+0
| | | | | The user can create a new directory on a different branch than the source branch when the branch already exists.
* New file from interface on existing branchJacopo2017-03-131-0/+7
| | | | | | Now you can create a new file and select a target_branch != source_branch. If the file that you want to create already exists on the target branch an error message is shown A glDropdown is used to select and create a new branch instead of a text field.
* Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-3/+3
|
* Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-011-1/+1
|
* No more and/orDouwe Maan2017-02-211-1/+1
|
* Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-101-4/+4
| | | | | Reason for renaming is to comply with naming convention of services in codebase.
* Address feedbackDouwe Maan2017-02-061-3/+2
|