summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rename-repo-files' into 'master' Douwe Maan2016-07-191-0/+6
|\
| * Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-193-2/+4
| |\
| * \ Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-182-2/+4
| |\ \
| * | | 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-121-4/+5
| * | | changes the usasge of path to file_path on blob_controller for compatibillity...tiagonbotelho2016-07-121-4/+4
| * | | fixes merge request edit bug where it would generate a cloned file and not re...tiagonbotelho2016-07-121-5/+0
| * | | 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
| * | | refactors blob_controllertiagonbotelho2016-07-121-1/+1
| * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+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-1/+1
| * | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-1/+5
| * | | 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 '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
| |/ / /
* | | | Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-181-1/+3
|/ / /
* | | 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 'lock_for_issuable' into 'master' Douwe Maan2016-07-122-2/+9
|\ \
| * | Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-122-2/+9
| |/
* | Cache todos pending/done dashboard query countsPaco Guzman2016-07-121-1/+1
|/
* Be explicit on merge request discussion variablesPaco Guzman2016-07-121-10/+15
* Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-113-60/+111
|\
| * Merge branch 'master' into single-file-diffsSean McGivern2016-07-111-28/+32
| |\
| * | DRY up diff_for_path actionsSean McGivern2016-07-083-77/+58
| * | Remove unused argument to CompareService#executeSean McGivern2016-07-081-4/+10
| * | Collapse large diffs by defaultSean McGivern2016-07-083-25/+89
* | | Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master' Douwe Maan2016-07-111-3/+2
|\ \ \ | |_|/ |/| |
| * | Just give regular 404, feedback:Lin Jen-Shin2016-07-111-1/+1
| * | Use Gitlab-Workhorse-Send-Data to send entry:Lin Jen-Shin2016-07-051-2/+1
* | | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-081-6/+0
|\ \ \
| * | | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-071-6/+0
View Lorry Controller Status