Commit Graph

43 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
blackst0ne b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
Douwe Maan eefbe9be06
Disable format determination based on path extension 2018-12-03 12:29:02 +01:00
Takuya Noguchi e902f462c2 Eliminate duplicated words
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-22 01:01:23 +09: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 e0054a9ab1 Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"
This reverts merge request !22526
2018-11-07 13:32:20 +00:00
Oswaldo Ferreira ec66ef1b74 Comment on any expanded diff line on MRs 2018-11-06 17:39:31 -02:00
blackst0ne e40f8f27a1 Update other links 2018-10-26 11:09:48 +11: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
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Douwe Maan fbc749a96e Reuse viewer param and move logic to blob controller 2018-06-15 09:42:56 +00:00
Tim Zallmann 4ac381a565 Changed the query string parameter to a string 2018-06-15 09:08:21 +02:00
Tim Zallmann 24068596ee Fixed linting error with trailing space in rb 2018-06-14 20:46:53 +02:00
Tim Zallmann 3b2a909ac2 Makes the html attribute in the json output optional with the option html_render=false 2018-06-14 19:37:16 +02:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Jacopo 2f40dac352 Refactor `have_http_status` into `have_gitlab_http_status` in the specs 2017-10-20 10:13:18 +02:00
Bob Van Landuyt e8ca579d88 Add a project forks spec helper
The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.
2017-10-07 11:46:23 +02:00
Luke "Jared" Bennett 91a6074348
Fix blob_controller_spec plain to raw_path 2017-08-04 13:45:44 +01:00
Douwe Maan 2197ee02e9 Merge branch 'master' into ide 2017-08-03 13:13:06 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Gabriel Mazetto abb878326c Rename many path_with_namespace -> full_path 2017-08-01 07:26:58 +02:00
Luke "Jared" Bennett 6448368b5b
Merge remote-tracking branch 'origin/master' into ide 2017-07-20 17:51:07 +01: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
Douwe Maan 70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00
Dmitriy Zaporozhets 134ba0b5cb Merge branch 'dm-tree-json' of gitlab.com:gitlab-org/gitlab-ce into dm-tree-json 2017-06-22 10:52:57 +02:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Dmitriy Zaporozhets 4b962efc01
Add extra data for RenderBlob json
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-06-15 21:10:49 +03:00
Sean McGivern 5069682d8e Enable RSpec/FilePath cop
- Ignore JS fixtures
- Ignore qa directory
- Rewrite concern specs to put concern name first
2017-04-26 12:50:32 +01:00
Douwe Maan d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
Eric Eastwood b42dc1a52b Linking to edit file directly 2017-04-06 16:36:38 +00:00
Douwe Maan ad640bc5f9 Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
Douwe Maan cd0f688707 Don't use potentially slow ForkService in spec 2017-02-20 11:16:08 -06:00
Douwe Maan 4a8a28eb9e Fix issue where files on a fork could not be edited 2017-02-17 12:54:41 -06:00
Robert Speicher 4642ca6686 Use `empty_project` where possible in controller specs 2017-01-25 17:14:38 -05:00
Felipe Artur 781cca8d45 Fix redirect after update file when user has forked project 2016-12-29 21:11:34 -02:00
James Lopez 280afe0a64 fix blob controller spec failure - updated not to use file-path- 2016-11-29 10:40:56 +01:00
Douwe Maan 742cee756b Merge branch 'jej-22869' into 'security'
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
2016-11-28 21:25:18 -03:00
Semyon Pupkov 40fa1b6e6f Use user from let instead recreate in before 2016-10-09 20:31:28 +05:00
Ruben Davila 7627cc1989 Validate presence of essential params for diff rendering
This will avoid application errors generated by the assumption of the
presence of these params.
2016-06-24 16:20:53 -05:00