Commit graph

22 commits

Author SHA1 Message Date
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