summaryrefslogtreecommitdiff
path: root/app/controllers/projects/blob_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Add feature specsDouwe Maan2017-02-061-2/+2
|
* Improve performance of finding last deployed environmentDouwe Maan2017-02-061-1/+1
|
* Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-061-0/+3
|
* Merge branch 'jej-22869' into 'security'Douwe Maan2016-11-281-12/+8
| | | | | | | | | | | | | | | | | | Fix information disclosure in `Projects::BlobController#update` It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that. - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) https://gitlab.com/gitlab-org/gitlab-ce/issues/22869 See merge request !2023
* Unify anchor link format for MR diff files !7298Yar2016-11-151-1/+1
| | | | | | | | Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298
* fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-091-6/+4
| | | | refactors update file
* Prevents accidental overwrites of commits from UIFrank West2016-08-151-2/+12
| | | | | | | | | | | | | Currently when a user performs an update of a file through the UI and there has already been a change committed to the file the previous commits will be overwritten without a check to see if the file has been changed. This commit uses the last commit sha at the time the user starts editing the file and compares it with the current sha of the file being edited to ensure they are the same before committing the file. If the shas do not match we throw an exception preventing the commit from the commit from occurring. Fixes #5857
* Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-0/+2
|
* renames :file_name to :file_pathtiagonbotelho2016-07-131-2/+2
|
* test for nil params :file_nametiagonbotelho2016-07-121-1/+1
|
* refactors update action to change commit_params with the correct pathtiagonbotelho2016-07-121-4/+5
|
* changes the usasge of path to file_path on blob_controller for ↵tiagonbotelho2016-07-121-4/+4
| | | | compatibillity with the create action
* fixes merge request edit bug where it would generate a cloned file and not ↵tiagonbotelho2016-07-121-5/+0
| | | | remove the previous one
* implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
|
* creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+0
|
* successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-0/+1
|
* implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-1/+0
|
* remove prints and useless commentstiagonbotelho2016-07-121-0/+1
|
* successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-1/+0
|