Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't notify users without access to the project when they are ↵dont-notify-users-without-project-access | Douwe Maan | 2015-08-26 | 1 | -3/+8 |
| | | | | (accidentally) mentioned in a note. | ||||
* | Create cross-reference for closing references on commits pushed to ↵ | Maël Valais | 2015-08-22 | 1 | -5/+10 |
| | | | | | | | | | | | non-default branches. I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example). Now, there are two different contexts: - when the commits with "closing reference" are pushed to the default branch, - when the commits with "closing reference" are pushed to a non-default branch. Closes gitlab-org/gitlab-ce#2190. | ||||
* | Merge branch 'reply-by-email' into 'master' | Robert Speicher | 2015-08-22 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | | | Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173 | ||||
| * | Merge branch 'master' into reply-by-email | Douwe Maan | 2015-08-20 | 15 | -199/+182 |
| |\ | |||||
| * | | Turn reply-by-email attachments into uploads. | Douwe Maan | 2015-08-19 | 1 | -3/+3 |
| | | | |||||
* | | | Check permissions on target project in merge request create service. | Douwe Maan | 2015-08-21 | 1 | -2/+8 |
| |/ |/| | |||||
* | | Remove unnecessary file | Dmitriy Zaporozhets | 2015-08-14 | 1 | -5/+0 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | merge with support of pre-receive and post-receive hooks | Dmitriy Zaporozhets | 2015-08-14 | 1 | -12/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Refactor how repository makes commit with pre/post receive hooks | Dmitriy Zaporozhets | 2015-08-14 | 5 | -66/+4 |
| | | |||||
* | | Refactor pre/post receive commit services into one class | Dmitriy Zaporozhets | 2015-08-14 | 3 | -153/+16 |
| | | |||||
* | | Make sure target has not changed during pre-receive hook | Dmitriy Zaporozhets | 2015-08-14 | 1 | -1/+8 |
| | | |||||
* | | Capture pre-receive exception | Dmitriy Zaporozhets | 2015-08-13 | 2 | -7/+19 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Implement commit transaction with pre-receive and post-receive hooks for web ↵ | Dmitriy Zaporozhets | 2015-08-13 | 6 | -8/+117 |
| | | | | | | | | | | | | editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 16 | -199/+268 |
|/ | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | ||||
* | Revert "Merge branch 'web-editor-rugged' into 'master'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -7/+6 |
| | | | | | | | This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Revert "Create and edit files in web editor via rugged" | Dmitriy Zaporozhets | 2015-08-11 | 2 | -34/+14 |
| | | | | | | This reverts commit 734a4ba87de7bc8cf152c5bc7f93ba04210b282d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Revert "Fix adding new file to empty repo" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -1/+1 |
| | | | | | | This reverts commit 27a158506e033acd7195acf91995c1574e122832. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Revert "Use rugged in web editor for base64 encoding" | Dmitriy Zaporozhets | 2015-08-11 | 2 | -28/+34 |
| | | | | This reverts commit 541133197be098732cdc14a12aa059e21cac3d71. | ||||
* | Revert "Create activity event and execute hooks on web editor commit" | Dmitriy Zaporozhets | 2015-08-11 | 3 | -11/+3 |
| | | | | This reverts commit 3d416f1682c5e6a6ac1ea7013f66bbd0d23b452c. | ||||
* | Revert "Make web editor work correctly after switch from satellites" | Dmitriy Zaporozhets | 2015-08-11 | 5 | -7/+5 |
| | | | | This reverts commit 435f680b897b892103fa157d4699dbb6d9ecf758. | ||||
* | Revert "Refactor web editor" | Dmitriy Zaporozhets | 2015-08-11 | 4 | -84/+117 |
| | | | | | | This reverts commit dfccb06dda344819989fa8d6a9a3c56c5ca0b65f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Revert "Merge branches inside one repository using rugged instead of satellites" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -48/+3 |
| | | | | This reverts commit d24c40ec219d76e01e2fab5f6ebf431adae91bdd. | ||||
* | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 13 | -180/+148 |
| | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Refactor Trigger post-receive hooks after commits are made by GitLab | Dmitriy Zaporozhets | 2015-08-10 | 1 | -11/+11 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Trigger post-receive hoooks when commits are made by GitLabtrigger-hooks | Dmitriy Zaporozhets | 2015-08-10 | 1 | -1/+64 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'merge-notifs' into 'master' | Robert Speicher | 2015-08-07 | 1 | -40/+9 |
|\ | | | | | | | See merge request !1077 | ||||
| * | Merge branch 'master' into merge-notifsmerge-notifs | Douwe Maan | 2015-08-06 | 13 | -148/+117 |
| |\ | |||||
| * | | Send notification to all participants when MR is merged. | Douwe Maan | 2015-07-30 | 1 | -40/+9 |
| | | | |||||
* | | | Merge branch 'master' into comment-updated-by | Douwe Maan | 2015-08-06 | 13 | -148/+117 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix merge request creation without branch selected | Dmitriy Zaporozhets | 2015-08-05 | 1 | -2/+7 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'master' into drop-satellites | Dmitriy Zaporozhets | 2015-08-04 | 6 | -6/+20 |
| |\ \ | | |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Fix refresh service | Dmitriy Zaporozhets | 2015-07-16 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Huge refactoring for accepting merge requests | Dmitriy Zaporozhets | 2015-07-16 | 8 | -95/+85 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Refactor compare and fetch logic | Dmitriy Zaporozhets | 2015-07-15 | 3 | -30/+13 |
| | | | |||||
| * | | Implement merge from forks without satellites | Dmitriy Zaporozhets | 2015-07-15 | 2 | -8/+21 |
| | | | |||||
| * | | Remove satellites | Dmitriy Zaporozhets | 2015-07-15 | 6 | -30/+7 |
| | | | |||||
| * | | Fetch reference from fork repo when create merge request | Dmitriy Zaporozhets | 2015-07-15 | 1 | -0/+9 |
| | | | |||||
* | | | Reset correct event cache | Douwe Maan | 2015-07-31 | 1 | -1/+1 |
| | | | |||||
* | | | Show who last edited a comment if it wasn't the original author | Douwe Maan | 2015-07-30 | 3 | -17/+6 |
| |/ |/| | |||||
* | | Merge branch 'rs-dev-issue-306' into 'master' | Valery Sizov | 2015-07-27 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Create project services on Project creation Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/306#note_53354 See merge request !1045 | ||||
| * | | Create project services on Project creationrs-dev-issue-306 | Robert Speicher | 2015-07-25 | 1 | -0/+2 |
| | | | |||||
* | | | Dynamically check `:admin_*` ability in IssuableBaseServicers-issue-2092 | Robert Speicher | 2015-07-24 | 3 | -2/+14 |
|/ / | | | | | | | Closes #2092 | ||||
* | | Return true/false from AutoMergeService#merge!remove-source-branch | Douwe Maan | 2015-07-23 | 1 | -0/+4 |
| | | |||||
* | | Fix Remove source-branch for MRs from same project | Douwe Maan | 2015-07-22 | 2 | -2/+6 |
| | | |||||
* | | Store commit count in project tableadvanced-cache | Dmitriy Zaporozhets | 2015-07-17 | 1 | -1/+0 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Build missing cache items in background job after each push | Dmitriy Zaporozhets | 2015-07-17 | 2 | -3/+4 |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773 | Robert Speicher | 2015-07-13 | 2 | -2/+2 |
| | |||||
* | Fix transferring of project to another group using the API. | Douwe Maan | 2015-07-11 | 1 | -8/+5 |
| | |||||
* | Simplify Issue and MergeRequest UpdateServicesrs-remove-task-states | Robert Speicher | 2015-07-08 | 2 | -10/+4 |
| | | | | Now that those pesky task states are gone, these become a lot simpler. | ||||
* | Remove unused `task_[un]check` states from Update services | Robert Speicher | 2015-07-08 | 2 | -11/+2 |
| | | | | These were left over from the old Task handling. |