summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rename-repo-files' into 'master' Douwe Maan2016-07-192-1/+8
|\
| * Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-194-3/+4
| |\
| * \ Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-189-21/+27
| |\ \
| * | | renames :file_name to :file_pathtiagonbotelho2016-07-131-2/+2
| * | | test for nil params :file_nametiagonbotelho2016-07-121-1/+1
| * | | refactors update action to change commit_params with the correct pathtiagonbotelho2016-07-122-5/+5
| * | | changes the usasge of path to file_path on blob_controller for compatibillity...tiagonbotelho2016-07-122-5/+5
| * | | fixes merge request edit bug where it would generate a cloned file and not re...tiagonbotelho2016-07-121-5/+0
| * | | removes debugging prints from codetiagonbotelho2016-07-121-8/+0
| * | | refactors blob_controllertiagonbotelho2016-07-121-0/+8
| * | | removes debugging prints from codetiagonbotelho2016-07-121-8/+0
| * | | refactors blob_controllertiagonbotelho2016-07-121-0/+8
| * | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
| * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+0
| * | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-0/+1
| * | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-1/+0
| * | | remove prints and useless commentstiagonbotelho2016-07-121-0/+1
| * | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-1/+0
| * | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
| * | | fixes merge request edit bug where it would generate a cloned file and not re...tiagonbotelho2016-07-121-0/+5
| * | | removes debugging prints from codetiagonbotelho2016-07-121-8/+0
| * | | refactors blob_controllertiagonbotelho2016-07-121-0/+8
| * | | removes debugging prints from codetiagonbotelho2016-07-121-8/+0
| * | | refactors blob_controllertiagonbotelho2016-07-122-1/+9
| * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-122-2/+3
| * | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-1/+0
| * | | remove prints and useless commentstiagonbotelho2016-07-121-1/+1
| * | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-122-2/+7
| * | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-1/+2
* | | | Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-191-4/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Improve code designKamil Trzcinski2016-07-181-6/+2
| * | | Improve manual actions code and add model, service and feature testsKamil Trzcinski2016-07-181-1/+1
| * | | Add implementation of manual actionsKamil Trzcinski2016-07-181-0/+9
* | | | Merge branch 'caironoleto/gitlab-ce-cn-issue-19747'Douwe Maan2016-07-181-0/+1
|\ \ \ \
| * | | | Allow bulk (un)subscription from issues in issue indexCairo Noleto2016-07-141-0/+1
* | | | | Merge branch 'issue_13343' into 'master' Robert Speicher2016-07-181-1/+2
|\ \ \ \ \
| * | | | | Allow build email service to be testedissue_13343Felipe Artur2016-07-151-1/+2
* | | | | | Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-1/+0
|\ \ \ \ \ \
| * | | | | | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-1/+0
| |/ / / / /
* | | | | | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-181-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+1
| |/ / / /
* | | | | Don't blow up in tree view on empty repoSean McGivern2016-07-181-1/+1
| |_|/ / |/| | |
* | | | Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-182-2/+6
|/ / /
* | | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-153-12/+5
|\ \ \
| * | | Use a single challenge for U2F authentication.Timothy Andrew2016-07-141-4/+3
| * | | Load Javascript U2F library selectively.Timothy Andrew2016-07-143-8/+2
* | | | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-132-9/+2
| |/ / |/| |
* | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+1
* | | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-131-1/+1
* | | Merge branch 'add-2fa-check-to-oauth' into 'master' Robert Speicher2016-07-121-1/+5
|\ \ \