Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | Add Page-Title header to tree and blob JSON endpoints | Douwe Maan | 2017-09-26 | 1 | -0/+2 |
| | |||||
* | Many Repo Fixes | Jacob Schatz | 2017-08-15 | 1 | -0/+5 |
| | |||||
* | Fix ABC size of BlobController#show | Luke "Jared" Bennett | 2017-08-04 | 1 | -24/+32 |
| | |||||
* | Add render_error to blob JSON | Douwe Maan | 2017-08-03 | 1 | -1/+2 |
| | |||||
* | Clean up some backend | Douwe Maan | 2017-08-03 | 1 | -6/+20 |
| | |||||
* | Add environment instance var to BlobController#show html resp | Luke "Jared" Bennett | 2017-07-31 | 1 | -0/+3 |
| | |||||
* | render blob/show if not show_new_repo? | Luke "Jared" Bennett | 2017-07-28 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into ide | Luke "Jared" Bennett | 2017-07-20 | 1 | -8/+8 |
|\ | |||||
| * | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -8/+8 |
| | | |||||
* | | Get single view working. | Jacob Schatz | 2017-07-10 | 1 | -5/+3 |
|/ | |||||
* | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 1 | -2/+2 |
| | |||||
* | Revert 'New file from interface on existing branch'dm-revert-mr-8427 | Douwe Maan | 2017-06-09 | 1 | -2/+0 |
| | |||||
* | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blob | Douwe Maan | 2017-06-08 | 1 | -3/+5 |
| | |||||
* | Blob#load_all_data! doesn’t need an argumentblob-load-all-data | Douwe Maan | 2017-06-07 | 1 | -3/+3 |
| | |||||
* | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 1 | -1/+1 |
| | |||||
* | Show last commit for current tree on tree page | Douwe Maan | 2017-05-17 | 1 | -0/+2 |
| | |||||
* | Use blob viewers for snippets | Douwe Maan | 2017-04-30 | 1 | -1/+1 |
| | |||||
* | Refactor overriding max size | Douwe Maan | 2017-04-27 | 1 | -0/+2 |
| | |||||
* | Add JSON endpoint to get simple blob viewer | Douwe Maan | 2017-04-27 | 1 | -2/+13 |
| | |||||
* | Pass project to Blob | Douwe Maan | 2017-04-27 | 1 | -1/+1 |
| | |||||
* | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 1 | -9/+9 |
| | |||||
* | Linking to edit file directly | Eric Eastwood | 2017-04-06 | 1 | -2/+8 |
| | |||||
* | New directory from interface on existing branch | Jacopo | 2017-03-21 | 1 | -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 branch | Jacopo | 2017-03-13 | 1 | -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 MR | Douwe Maan | 2017-03-02 | 1 | -3/+3 |
| | |||||
* | Enable and autocorrect the CustomErrorClass cop | Sean McGivern | 2017-03-01 | 1 | -1/+1 |
| | |||||
* | No more and/or | Douwe Maan | 2017-02-21 | 1 | -1/+1 |
| | |||||
* | Rename Files::DeleteService to Files::DestroyService | dixpac | 2017-02-10 | 1 | -4/+4 |
| | | | | | Reason for renaming is to comply with naming convention of services in codebase. | ||||
* | Address feedback | Douwe Maan | 2017-02-06 | 1 | -3/+2 |
| | |||||
* | Add feature specs | Douwe Maan | 2017-02-06 | 1 | -2/+2 |
| | |||||
* | Improve performance of finding last deployed environment | Douwe Maan | 2017-02-06 | 1 | -1/+1 |
| | |||||
* | Add 'View on [env]' link to blobs and individual files in diffs | Douwe Maan | 2017-02-06 | 1 | -0/+3 |
| | |||||
* | Merge branch 'jej-22869' into 'security' | Douwe Maan | 2016-11-28 | 1 | -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 !7298 | Yar | 2016-11-15 | 1 | -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-files | tiagonbotelho | 2016-09-09 | 1 | -6/+4 |
| | | | | refactors update file | ||||
* | Prevents accidental overwrites of commits from UI | Frank West | 2016-08-15 | 1 | -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 view | Tim Masliuchenko | 2016-08-04 | 1 | -0/+2 |
| | |||||
* | renames :file_name to :file_path | tiagonbotelho | 2016-07-13 | 1 | -2/+2 |
| | |||||
* | test for nil params :file_name | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| | |||||
* | refactors update action to change commit_params with the correct path | tiagonbotelho | 2016-07-12 | 1 | -4/+5 |
| | |||||
* | changes the usasge of path to file_path on blob_controller for ↵ | tiagonbotelho | 2016-07-12 | 1 | -4/+4 |
| | | | | compatibillity with the create action | ||||
* | fixes merge request edit bug where it would generate a cloned file and not ↵ | tiagonbotelho | 2016-07-12 | 1 | -5/+0 |
| | | | | remove the previous one | ||||
* | implements the form for renaming the new filename on the file edit page | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| | |||||
* | creates the update_file method in repository.rb and applies changes accordingly | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| | |||||
* | successfully adds the new version with the updated name on the projects repo | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| | |||||
* | implements the form for renaming the new filename on the file edit page | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| | |||||
* | remove prints and useless comments | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| | |||||
* | successfully adds the new version with the updated name on the projects repo | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| |