summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Improve wording in abuse report formDmitriy Zaporozhets2015-08-062-5/+4
* Remove selectbox from abuse form. Added pagination in admin areaDmitriy Zaporozhets2015-08-062-5/+3
* Add abuse report management in admin areaDmitriy Zaporozhets2015-08-064-0/+57
* Allow users to send abuse reportsDmitriy Zaporozhets2015-08-064-0/+71
* Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0532-242/+237
|\
| * Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-051-2/+7
| * Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0492-308/+550
| |\
| * | Fix refresh serviceDmitriy Zaporozhets2015-07-161-1/+1
| * | Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ...Dmitriy Zaporozhets2015-07-162-6/+5
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-1617-130/+129
| * | Refactor compare and fetch logicDmitriy Zaporozhets2015-07-158-51/+36
| * | Implement update of ref when merge request code is reloadedDmitriy Zaporozhets2015-07-151-9/+18
| * | Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-157-22/+62
| * | Remove satellitesDmitriy Zaporozhets2015-07-1514-58/+14
| * | Fetch reference from fork repo when create merge requestDmitriy Zaporozhets2015-07-152-0/+14
* | | Merge branch 'ci-skipped-status' into 'master' Kamil TrzciƄski2015-08-054-2/+13
|\ \ \
| * | | Added support for CI skipped statusci-skipped-statusKamil Trzcinski2015-08-044-2/+13
| | |/ | |/|
* | | Merge branch 'revert_touch' into 'master' Sytse Sijbrandij2015-08-051-1/+1
|\ \ \
| * | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-051-1/+1
| |/ /
* | | Merge branch 'add-resend-confirm-email-admin-page' into 'master'Dmitriy Zaporozhets2015-08-052-0/+18
|\ \ \
| * | | Add "Confirm user" button in user admin pageStan Hu2015-08-052-0/+18
| |/ /
* | | Merge remote-tracking branch 'public/project-buttons'Dmitriy Zaporozhets2015-08-056-26/+37
|\ \ \ | |/ / |/| |
| * | Don't hide the clone holder for an empty projectproject-buttonsRobert Speicher2015-08-041-3/+3
| * | Merge branch 'master' into project-buttonsDouwe Maan2015-07-312-4/+9
| |\ \
| * | | Tweak project page buttons.Douwe Maan2015-07-316-26/+37
* | | | Merge branch 'update-mr-branch-text' into 'master'Douwe Maan2015-08-041-2/+4
|\ \ \ \
| * | | | Update merge request text to reflect editability of source/target branchStan Hu2015-08-031-2/+4
* | | | | Merge branch 'add-license'Dmitriy Zaporozhets2015-08-034-8/+68
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into add-licenseadd-licenseDouwe Maan2015-07-312-4/+9
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix method name.Douwe Maan2015-07-301-1/+1
| * | | | Show buttons to add license, changelog and contribution guide if they're miss...Douwe Maan2015-07-303-7/+67
| | |/ / | |/| |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-08-025-3/+34
|\ \ \ \
| * | | | Re-annotate modelsAtsushi Ishida2015-08-035-3/+34
* | | | | Make `code` elements in links display as suchrs-code-linksRobert Speicher2015-07-312-1/+5
|/ / / /
* | | | Merge branch 'mention-name-in-flash-msg' into 'master'Douwe Maan2015-07-312-7/+7
|\ \ \ \
| * | | | Raise alert when group is deleted.Achilleas Pipinellis2015-07-301-1/+1
| * | | | Mention group and project name in flash messages upon create, update and delete.Achilleas Pipinellis2015-07-302-7/+7
* | | | | Merge branch 'admin-group-member' into 'master' Douwe Maan2015-07-316-20/+33
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use before_actionsDouwe Maan2015-07-312-4/+7
| * | | | Restore Leave button on dashboard groups pageadmin-group-memberDouwe Maan2015-07-291-4/+3
| * | | | Show Leave button when you're the last owner, so that the error explains the ...Douwe Maan2015-07-281-1/+1
| * | | | Disable adding members from admin area when appropriateDouwe Maan2015-07-281-16/+18
| * | | | Add specific ability for managing group membersDouwe Maan2015-07-285-7/+16
* | | | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-302-4/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix Projectapi-new-attributesDouwe Maan2015-07-301-1/+1
| * | | | No more web urlDouwe Maan2015-07-303-12/+1
| * | | | Fix specsDouwe Maan2015-07-291-1/+1
| * | | | Merge branch 'master' into api-new-attributesDouwe Maan2015-07-295-8/+15
| |\ \ \ \
| * | | | | Use URL helpersDouwe Maan2015-07-293-4/+5
| * | | | | Add project star and fork count, group avatar URL and user/group web URL attr...Douwe Maan2015-07-282-0/+15
| | |/ / / | |/| | |