Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | 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 |
| |