summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Groundwork for merging CI into CEDouwe Maan2015-08-2524-4/+1890
* Merge branch 'fix-error-500-groups-with-avatar' into 'master'Douwe Maan2015-08-241-0/+1
|\
| * Fix Error 500 in API when accessing a group that has an avatarStan Hu2015-08-241-0/+1
* | Ability to search milestonesmilestone_searchValery Sizov2015-08-241-1/+8
|/
* Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-221-0/+50
|\
| * Merge branch 'master' into reply-by-emailDouwe Maan2015-08-207-50/+223
| |\
| * | Move `sent_notification!` out of Notify.Douwe Maan2015-08-191-2/+25
| * | Changes and stuff.Douwe Maan2015-08-181-5/+3
| * | Reply by email POCDouwe Maan2015-08-181-0/+29
* | | Merge branch 'hide-recent-push' into 'master'Dmitriy Zaporozhets2015-08-211-2/+13
|\ \ \
| * | | Only show recent push event if the branch still exists or a recent merge requ...Stan Hu2015-08-201-2/+13
* | | | Merge branch 'comment-case-insensetive-search' into 'master'Dmitriy Zaporozhets2015-08-211-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Case-insensetive search for commentscomment-case-insensetive-searchDmitriy Zaporozhets2015-08-191-1/+1
* | | | Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-1/+14
| |/ / |/| |
* | | Allow listing of archived projectsArtem Sidorenko2015-08-191-1/+1
|/ /
* | Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-196-48/+208
|\ \ | |/ |/|
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-175-2/+33
| |\
| * | Fix typo in text when raise pre-receive exceptionDmitriy Zaporozhets2015-08-171-1/+1
| * | save repo empty state into variable for proper resultpre-receive-wo-satellitesDmitriy Zaporozhets2015-08-171-2/+3
| * | merge with support of pre-receive and post-receive hooksDmitriy Zaporozhets2015-08-141-8/+10
| * | Refactor how repository makes commit with pre/post receive hooksDmitriy Zaporozhets2015-08-141-29/+90
| * | Implement commit transaction with pre-receive and post-receive hooks for web ...Dmitriy Zaporozhets2015-08-131-1/+1
| * | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-116-48/+144
* | | Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets2015-08-181-0/+4
|\ \ \ | |_|/ |/| |
| * | Clear cache to prevent listing deleted branches after MR removes source branchStan Hu2015-08-141-0/+4
* | | Update Flowdock integration to support new Flowdock APIBoyan Tabakov2015-08-141-1/+1
|/ /
* | Merge branch 'improve-hipchat-service-test' into 'master'Dmitriy Zaporozhets2015-08-132-1/+17
|\ \
| * | Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-122-1/+17
| |/
* | api: add 'system', 'upvote', and 'downvote' fields to note queriesBen Boeckel2015-08-121-0/+4
* | Add merged label on branches pageFlorent (HP)2015-08-111-0/+11
|/
* Revert "Create and edit files in web editor via rugged"Dmitriy Zaporozhets2015-08-111-47/+0
* Fix conflict issueDmitriy Zaporozhets2015-08-111-2/+0
* Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets2015-08-112-14/+3
* Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-112-10/+7
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-116-87/+54
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-112-3/+3
* Merge branch 'improve-merge-requests' into 'master' Dmitriy Zaporozhets2015-08-072-3/+3
|\
| * Create ref for every merge request. Add documentation for fetch merge requestsDmitriy Zaporozhets2015-08-071-2/+2
| * Fetch to mr code from fork to iidDmitriy Zaporozhets2015-08-071-1/+1
* | Merge branch 'comment-updated-by' into 'master' Douwe Maan2015-08-072-0/+2
|\ \
| * \ Merge branch 'master' into comment-updated-bycomment-updated-byDouwe Maan2015-08-072-0/+12
| |\ \ | | |/
| * | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-0614-62/+132
| |\ \
| * \ \ Merge branch 'master' into comment-updated-byDouwe Maan2015-07-312-6/+11
| |\ \ \
| * | | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-302-0/+2
* | | | | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-071-1/+17
| |_|_|/ |/| | |
* | | | Merge branch 'fix-namespace-move-dir' into 'master' Dmitriy Zaporozhets2015-08-061-0/+3
|\ \ \ \
| * | | | Ensure old namespace directory exists before moving itfix-namespace-move-dirDmitriy Zaporozhets2015-08-061-0/+3
* | | | | Merge branch 'report-spam'Dmitriy Zaporozhets2015-08-061-0/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Allow users to send abuse reportsDmitriy Zaporozhets2015-08-061-0/+9
| |/ / /
* | | | Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-062-1/+6
|\ \ \ \ | |/ / / |/| | |