summaryrefslogtreecommitdiff
path: root/app/controllers/projects/branches_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-6/+5
|
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
|
* Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-091-6/+1
|
* Merge request widget redesignFatih Acet2017-05-091-0/+1
|
* Add confirm delete protected branch modalSam Rose2017-05-081-4/+8
|
* Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-13/+21
|
* removes n+1 query from tags and branches indexesfix-slow-queries-for-branches-indexTiago Botelho2017-03-161-2/+8
|
* New file from interface on existing branchJacopo2017-03-131-6/+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 json response in branches controllerGeorge Andrinopoulos2017-03-061-1/+1
|
* Fixes after reviewcreate_branch_repo_lessValery Sizov2017-02-231-5/+15
|
* Create master branch first if project is repository-lessValery Sizov2017-02-231-4/+16
|
* Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'Douwe Maan2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix missing access checks on issue lookup using IssuableFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested - [x] :white_check_mark: 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] :traffic_light: app/models/cycle_analytics/summary.rb:9 [`.count`] - [x] :white_check_mark: 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
* Add button to delete all merged branchesToon Claes2016-11-091-1/+8
| | | | | | | | 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.
* Fix tests.Connor Shea2016-08-171-1/+1
|
* Initial implementation of an async branch dropdown for Revert and Cherry Pick.Connor Shea2016-08-171-0/+7
|
* Fix branches page dropdown sort initial stateClement Ho2016-08-101-1/+2
|
* Fix the title of the toggle dropdown buttonHerminio Torres2016-07-281-0/+1
| | | | | | | | | | | | | | Before when you choose the way of `sort` instead it display the title correctly it was just apply the humanize helper in sort value. E.g. When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title. Change the implementation of the `link_to` `filter_branches_path` - Change the value of the `params[:sort]` in `link_to`. E.g. instead of using `'recently_updated'` is now using `sort_value_recently_updated`. - Change the values of the case in the `branches_sorted_by` method for the values it receives in the `params[:sort]` that are: `nil`, `'name'`, `'updated_desc'`, `'updated_asc'`.
* implements the basic filter functionalitytiagonbotelho2016-07-191-2/+1
|
* Update tests to match new Code tab logicDmitriy Zaporozhets2016-06-031-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Put project Files and Commits tabs under Code tabDmitriy Zaporozhets2016-06-031-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu2016-04-061-1/+1
| | | | Closes #14994
* Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-191-1/+1
|
* Incorporate reviewZeger-Jan van de Weg2016-03-151-4/+3
|
* Enhance new branch button on an issueZeger-Jan van de Weg2016-03-151-0/+6
|
* new-branch-buttonZeger-Jan van de Weg2016-03-151-3/+13
|
* Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-031-1/+1
|\
| * Add authorization to new branch/tag pages.new-tag-branch-authorizationDouwe Maan2015-12-031-1/+1
| |
* | Refactor for style issuesJeff Stubler2015-11-111-2/+1
| |
* | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+6
|/
* Fix errors deleting and creating branches with encoded slashesStan Hu2015-08-011-3/+4
| | | | Closes #1804
* Return 40x error codes if branch could not be deleted in UIStan Hu2015-07-061-2/+2
|
* Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-3/+3
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Use same constant for amount of items per pageDmitriy Zaporozhets2015-03-121-1/+1
|
* Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-211-1/+0
|\ | | | | | | | | | | | | | | | | Conflicts: app/views/projects/commits/_commit.html.haml app/views/projects/issues/_issue.html.haml app/views/projects/issues/_issue_context.html.haml app/views/projects/merge_requests/_merge_request.html.haml app/views/projects/merge_requests/show/_context.html.haml
| * Move 'require_non_empty_project' filter to front so 'assign_ref_vars' ↵Douwe Maan2015-02-201-1/+0
| | | | | | | | doesn't 404.
* | Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-2/+6
|/ | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* Sanitize branch name and ref nameMarin Jankovski2014-11-131-1/+4
|
* remove auth duplicationValery Sizov2014-11-051-1/+0
|
* API delete branch: render branch name json instead of trueDmitriy Zaporozhets2014-10-301-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Factor authorize_push! and authorize_code_access!Ciro Santilli2014-10-131-2/+2
| | | | | with existing method_missing. Pattern already used extensively, so let's be consistent and use it everywhere.
* Factor error and success methods from services.Ciro Santilli2014-09-211-5/+3
|
* Validate branch-names and references in WebUI, APIRobert Schilling2014-09-031-3/+11
| | | | Add specs for GitRefValidator
* Changed some stuff around after rebaseJeroen van Baarsen2014-05-231-1/+1
|
* Make sure the branch counter gets updatedJeroen van Baarsen2014-05-231-1/+2
| | | | | | | | When you delete a branch, the counters wont get updated automaticly, this happends because of the JS nature of the original call. I've fixed this by responding with a JS file, and recalculate the counters. Fixes: #6030
* Merge branch 'branch-creation-flow' into 'master'Dmitriy Zaporozhets2014-05-231-2/+2
|\ | | | | | | | | | | | | | | | | Branch creation flow To improve user experience with web editing I did next improvements: * when create branch via ui - redirect to tree view so you start add/edit files * when click on branch name - redirect to tree view instead of commits so you can immedialty add/edit files
| * Redirect to tree view after branch createdDmitriy Zaporozhets2014-05-231-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move protected branches to Project settingsDmitriy Zaporozhets2014-05-231-1/+3
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve branch-removal logicDmitriy Zaporozhets2014-05-221-7/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move branch creation logic in serviceDmitriy Zaporozhets2014-04-011-5/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor recent branches pageDmitriy Zaporozhets2013-08-051-0/+4
|