| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'rename-repo-files' into 'master'
| Douwe Maan | 2016-07-19 | 1 | -0/+6 |
|\ |
|
| * | Merge branch 'master' into rename-repo-files | tiagonbotelho | 2016-07-19 | 3 | -2/+4 |
| |\ |
|
| * \ | Merge branch 'master' into rename-repo-files | tiagonbotelho | 2016-07-18 | 2 | -2/+4 |
| |\ \ |
|
| * | | | renames :file_name to :file_path | tiagonbotelho | 2016-07-13 | 1 | -2/+2 |
| * | | | test for nil params :file_name | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| * | | | refactors update action to change commit_params with the correct path | tiagonbotelho | 2016-07-12 | 1 | -4/+5 |
| * | | | changes the usasge of path to file_path on blob_controller for compatibillity... | tiagonbotelho | 2016-07-12 | 1 | -4/+4 |
| * | | | fixes merge request edit bug where it would generate a cloned file and not re... | tiagonbotelho | 2016-07-12 | 1 | -5/+0 |
| * | | | implements the form for renaming the new filename on the file edit page | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| * | | | creates the update_file method in repository.rb and applies changes accordingly | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| * | | | successfully adds the new version with the updated name on the projects repo | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| * | | | implements the form for renaming the new filename on the file edit page | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| * | | | remove prints and useless comments | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| * | | | successfully adds the new version with the updated name on the projects repo | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| * | | | implements the form for renaming the new filename on the file edit page | tiagonbotelho | 2016-07-12 | 1 | -0/+1 |
| * | | | fixes merge request edit bug where it would generate a cloned file and not re... | tiagonbotelho | 2016-07-12 | 1 | -0/+5 |
| * | | | refactors blob_controller | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| * | | | creates the update_file method in repository.rb and applies changes accordingly | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| * | | | implements the form for renaming the new filename on the file edit page | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| * | | | remove prints and useless comments | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| * | | | successfully adds the new version with the updated name on the projects repo | tiagonbotelho | 2016-07-12 | 1 | -1/+5 |
| * | | | implements the form for renaming the new filename on the file edit page | tiagonbotelho | 2016-07-12 | 1 | -1/+2 |
* | | | | Merge branch 'manual-actions' into 'master'
| Rémy Coutable | 2016-07-19 | 1 | -4/+9 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Improve code design | Kamil Trzcinski | 2016-07-18 | 1 | -6/+2 |
| * | | | Improve manual actions code and add model, service and feature tests | Kamil Trzcinski | 2016-07-18 | 1 | -1/+1 |
| * | | | Add implementation of manual actions | Kamil Trzcinski | 2016-07-18 | 1 | -0/+9 |
| | |/
| |/| |
|
* | | | Merge branch 'caironoleto/gitlab-ce-cn-issue-19747' | Douwe Maan | 2016-07-18 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | Allow bulk (un)subscription from issues in issue index | Cairo Noleto | 2016-07-14 | 1 | -0/+1 |
* | | | | Merge branch 'issue_13343' into 'master'
| Robert Speicher | 2016-07-18 | 1 | -1/+2 |
|\ \ \ \ |
|
| * | | | | Allow build email service to be testedissue_13343 | Felipe Artur | 2016-07-15 | 1 | -1/+2 |
* | | | | | Merge branch 'undo-revert-of-4892' into 'master'
19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-state | Rémy Coutable | 2016-07-18 | 1 | -1/+1 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'
"" | Rémy Coutable | 2016-07-18 | 1 | -1/+1 |
| |/ / / |
|
* | | | | Add Pending Tab to Admin Builds | Katarzyna Kobierska | 2016-07-18 | 1 | -1/+3 |
|/ / / |
|
* | | | Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuable | Stan Hu | 2016-07-13 | 2 | -9/+2 |
|/ / |
|
* | | Revert "Merge branch '18193-developers-can-merge' into 'master'
" | Robert Speicher | 2016-07-13 | 1 | -1/+1 |
* | | Added "developers can merge" setting to protected branches | Mathias Vestergaard | 2016-07-13 | 1 | -1/+1 |
* | | Merge branch 'lock_for_issuable' into 'master'
| Douwe Maan | 2016-07-12 | 2 | -2/+9 |
|\ \ |
|
| * | | Optimistic locking for Issue and Merge Requests | Valery Sizov | 2016-07-12 | 2 | -2/+9 |
| |/ |
|
* | | Cache todos pending/done dashboard query counts | Paco Guzman | 2016-07-12 | 1 | -1/+1 |
|/ |
|
* | Be explicit on merge request discussion variables | Paco Guzman | 2016-07-12 | 1 | -10/+15 |
* | Merge branch 'single-file-diffs' into 'master'
| Douwe Maan | 2016-07-11 | 3 | -60/+111 |
|\ |
|
| * | Merge branch 'master' into single-file-diffs | Sean McGivern | 2016-07-11 | 1 | -28/+32 |
| |\ |
|
| * | | DRY up diff_for_path actions | Sean McGivern | 2016-07-08 | 3 | -77/+58 |
| * | | Remove unused argument to CompareService#execute | Sean McGivern | 2016-07-08 | 1 | -4/+10 |
| * | | Collapse large diffs by default | Sean McGivern | 2016-07-08 | 3 | -25/+89 |
* | | | Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master'
| Douwe Maan | 2016-07-11 | 1 | -3/+2 |
|\ \ \
| |_|/
|/| | |
|
| * | | Just give regular 404, feedback: | Lin Jen-Shin | 2016-07-11 | 1 | -1/+1 |
| * | | Use Gitlab-Workhorse-Send-Data to send entry: | Lin Jen-Shin | 2016-07-05 | 1 | -2/+1 |
* | | | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master'
| Rémy Coutable | 2016-07-08 | 1 | -6/+0 |
|\ \ \ |
|
| * | | | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-required | Paco Guzman | 2016-07-07 | 1 | -6/+0 |