summaryrefslogtreecommitdiff
path: root/app/controllers/projects/branches_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* create corresponding events when create branch/tag with UIDmitriy Zaporozhets2013-07-171-4/+8
|
* Improve permissions on tags/branchesDmitriy Zaporozhets2013-07-171-1/+3
|
* Ability to create new branch via UIDmitriy Zaporozhets2013-07-171-2/+4
|
* Move repo tags to own controller. add ability to remove tagsDmitriy Zaporozhets2013-07-161-1/+1
|
* Create event on dashboard when branch removed via UIDmitriy Zaporozhets2013-07-161-1/+5
|
* Move branches list to own controller with pagination. Ability to remove ↵Dmitriy Zaporozhets2013-07-161-0/+24
branches from UI