Commit graph

17 commits

Author SHA1 Message Date
Alfredo Sumaran
b64a37c4ed Allow to create new branch and empty WIP merge request from issue page 2017-05-04 08:09:21 +00:00
Jacopo
e0fe2834eb New file from interface on existing branch
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.
2017-03-13 16:36:11 +01:00
George Andrinopoulos
905a2993e9 Fix json response in branches controller 2017-03-06 11:48:40 +02:00
Sean McGivern
faaca5e191 Merge branch 'dm-more-namespace-full-path' into 'master'
Use Namespace#full_path instead of #path where appropriate

See merge request !9495
2017-02-24 15:39:12 +00:00
Douwe Maan
ad640bc5f9 Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
Valery Sizov
d52ef5efd0 Fixes after review 2017-02-23 15:31:03 +02:00
Valery Sizov
08e4d98cac Create master branch first if project is repository-less 2017-02-23 15:31:03 +02:00
Robert Speicher
4642ca6686 Use empty_project where possible in controller specs 2017-01-25 17:14:38 -05:00
Douwe Maan
6d37fe952b Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'
Fix missing access checks on issue lookup using IssuableFinder

Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867

⚠️ - Potentially untested
💣 - No test coverage
🚥 - Test coverage of some sort exists (a test failed when error raised)
🚦 - Test coverage of return value (a test failed when nil used)
 - Permissions check tested

- [x]  app/controllers/projects/branches_controller.rb:39
  - `before_action :authorize_push_code!` helpes limit/prevent exploitation. Always checks for reporter access so fine with
    confidential issues, issues only visible to team, etc.
- [x] 🚥 app/models/cycle_analytics/summary.rb:9 [`.count`]
- [x]  app/controllers/projects/todos_controller.rb:19

- [x] Potential double render in app/controllers/projects/todos_controller.rb

- https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#cedccb227af9bfdf88802767cb58d43c2b977439_24_24

See merge request !2030
2016-11-28 21:25:46 -03:00
Toon Claes
1afab9eb79 Add button to delete all merged branches
It adds a button to the branches page that the user can use to delete
all the branches that are already merged. This can be used to clean up
all the branches that were forgotten to delete while merging MRs.

Fixes #21076.
2016-11-09 21:04:03 +01:00
Grzegorz Bizon
9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Z.J. van de Weg
abca19da8b Use HTTP matchers if possible 2016-06-27 20:10:42 +02:00
Dmitriy Zaporozhets
334cb86821 Update test since branch removal does not render template anymore
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03 10:13:40 +03:00
Stan Hu
924e4b3700 Return status code 303 after a branch DELETE operation to avoid project deletion
Closes #14994
2016-04-06 21:11:10 -07:00
Zeger-Jan van de Weg
2b97c92119 Incorporate review 2016-03-15 20:21:11 +01:00
Zeger-Jan van de Weg
ad97bebfed Enhance new branch button on an issue 2016-03-15 20:21:11 +01:00
Robert Speicher
dfca5bfa47 Move a few controller specs to their correct locations 2016-02-18 21:50:49 -05:00
Renamed from spec/controllers/branches_controller_spec.rb (Browse further)