summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Re-annotate modelsStan Hu2015-09-067-69/+113
|
* Drone CI serviceKirilll Zaitsev2015-09-024-4/+206
|
* Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-297-11/+73
|\
| * Make all profile publicmake_all_profile_publicValery Sizov2015-08-271-4/+0
| |
| * Merge branch 'enable_ssl_verification_web_hook' into 'master'Dmitriy Zaporozhets2015-08-263-6/+14
| |\ | | | | | | | | | | | | | | | | | | | | | Enable SSL verification for Webhooks https://dev.gitlab.org/gitlab/gitlabhq/issues/2121 See merge request !1135
| | * Enable SSL verification for Webhooksenable_ssl_verification_web_hookValery Sizov2015-08-263-6/+14
| | |
| * | 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 avatar Closes #2340 See merge request !1189
| | * Fix Error 500 in API when accessing a group that has an avatarStan Hu2015-08-241-0/+1
| | | | | | | | | | | | Closes #2340
| * | Ability to search milestonesmilestone_searchValery Sizov2015-08-241-1/+8
| |/
| * Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-221-0/+50
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
| | * 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
| | | |
* | | | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-1/+1
|/ / /
* | | 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 request has not been created Closes #2277 See merge request !1167
| * | | Only show recent push event if the branch still exists or a recent merge ↵Stan Hu2015-08-201-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | request has not been created Closes #2277
* | | | Merge branch 'comment-case-insensetive-search' into 'master'Dmitriy Zaporozhets2015-08-211-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Case-insensitive search for comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1174
| * | | Case-insensetive search for commentscomment-case-insensetive-searchDmitriy Zaporozhets2015-08-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-1/+14
| |/ / |/| |
* | | Allow listing of archived projectsArtem Sidorenko2015-08-191-1/+1
|/ / | | | | | | Resolves #9285
* | Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-196-48/+208
|\ \ | |/ |/| | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-175-2/+33
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix typo in text when raise pre-receive exceptionDmitriy Zaporozhets2015-08-171-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | save repo empty state into variable for proper resultpre-receive-wo-satellitesDmitriy Zaporozhets2015-08-171-2/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | merge with support of pre-receive and post-receive hooksDmitriy Zaporozhets2015-08-141-8/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | 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
| | | | | | | | | | | | | | | | | | editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-116-48/+144
| | | | | | | | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* | | 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 branch Closes #2272 See merge request !1160
| * | Clear cache to prevent listing deleted branches after MR removes source branchStan Hu2015-08-141-0/+4
| | | | | | | | | | | | Closes #2272
* | | Update Flowdock integration to support new Flowdock APIBoyan Tabakov2015-08-141-1/+1
|/ / | | | | | | Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
* | Merge branch 'improve-hipchat-service-test' into 'master'Dmitriy Zaporozhets2015-08-132-1/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide more feedback what went wrong if HipChat service failed test This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks. Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/10f82eb02db138f9680e69cdb3d3ed82/image.png) Issue gitlab-com/support-forum#213 See merge request !1144
| * | Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-122-1/+17
| |/ | | | | | | Issue gitlab-com/support-forum#213
* | api: add 'system', 'upvote', and 'downvote' fields to note queriesBen Boeckel2015-08-121-0/+4
| | | | | | | | This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9.
* | 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
| | | | | | This reverts commit 734a4ba87de7bc8cf152c5bc7f93ba04210b282d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix conflict issueDmitriy Zaporozhets2015-08-111-2/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets2015-08-112-14/+3
| | | | This reverts commit d24c40ec219d76e01e2fab5f6ebf431adae91bdd.
* Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-112-10/+7
| | | | | | | This reverts commit 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a, reversing changes made to 804168e1def1204af712febb229f41a3865f085f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-116-87/+54
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-112-3/+3
| | | | | This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
* Merge branch 'improve-merge-requests' into 'master' Dmitriy Zaporozhets2015-08-072-3/+3
|\ | | | | | | | | | | | | | | | | | | | | Improve merge requests - [x] Fetch merge request refs by IID - [x] Ability to fetch any merge request - [x] Link commits and diffs in merge request to target project - [x] Improve merge request UI and command line instructions - [x] Check merge request widget loading test coverage double See merge request !1115
| * Create ref for every merge request. Add documentation for fetch merge requestsDmitriy Zaporozhets2015-08-071-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fetch to mr code from fork to iidDmitriy Zaporozhets2015-08-071-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'comment-updated-by' into 'master' Douwe Maan2015-08-072-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Show who last edited a comment if it wasn't the original author Fixes #1796. The `updated_by` user is also tracked for issues and merge requests, but it isn't currently shown, because "edited by Person" would give the idea that Person edited the description, while most updates to those are assignee/milestone/labels, in which case who made that change is already visible in the comments. See merge request !1075
| * \ 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
| | | | |
View Lorry Controller Status