summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Collapse)AuthorAgeFilesLines
* Trigger post-receive hoooks when commits are made by GitLabtrigger-hooksDmitriy Zaporozhets2015-08-101-1/+64
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'merge-notifs' into 'master'Robert Speicher2015-08-071-40/+9
|\ | | | | | | See merge request !1077
| * Merge branch 'master' into merge-notifsmerge-notifsDouwe Maan2015-08-0613-148/+117
| |\
| * | Send notification to all participants when MR is merged.Douwe Maan2015-07-301-40/+9
| | |
* | | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-0613-148/+117
|\ \ \ | | |/ | |/|
| * | Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-051-2/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-046-6/+20
| |\ \ | | |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix refresh serviceDmitriy Zaporozhets2015-07-161-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-168-95/+85
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor compare and fetch logicDmitriy Zaporozhets2015-07-153-30/+13
| | |
| * | Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-152-8/+21
| | |
| * | Remove satellitesDmitriy Zaporozhets2015-07-156-30/+7
| | |
| * | Fetch reference from fork repo when create merge requestDmitriy Zaporozhets2015-07-151-0/+9
| | |
* | | Reset correct event cacheDouwe Maan2015-07-311-1/+1
| | |
* | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-303-17/+6
| |/ |/|
* | Merge branch 'rs-dev-issue-306' into 'master' Valery Sizov2015-07-271-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-306Robert Speicher2015-07-251-0/+2
| | |
* | | Dynamically check `:admin_*` ability in IssuableBaseServicers-issue-2092Robert Speicher2015-07-243-2/+14
|/ / | | | | | | Closes #2092
* | Return true/false from AutoMergeService#merge!remove-source-branchDouwe Maan2015-07-231-0/+4
| |
* | Fix Remove source-branch for MRs from same projectDouwe Maan2015-07-222-2/+6
| |
* | Store commit count in project tableadvanced-cacheDmitriy Zaporozhets2015-07-171-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Build missing cache items in background job after each pushDmitriy Zaporozhets2015-07-172-3/+4
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773Robert Speicher2015-07-132-2/+2
|
* Fix transferring of project to another group using the API.Douwe Maan2015-07-111-8/+5
|
* Simplify Issue and MergeRequest UpdateServicesrs-remove-task-statesRobert Speicher2015-07-082-10/+4
| | | | Now that those pesky task states are gone, these become a lot simpler.
* Remove unused `task_[un]check` states from Update servicesRobert Speicher2015-07-082-11/+2
| | | | These were left over from the old Task handling.
* Audit log for user authenticationValery Sizov2015-07-061-0/+25
|
* Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets2015-07-011-3/+40
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Change dynamic abilities to new formatDmitriy Zaporozhets2015-06-261-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-261-1/+1
| | | | | | | | | | | | | | | | | write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Simplify set of assignee, milestone and label to admin_issue ruleDmitriy Zaporozhets2015-06-261-7/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont allow set assignee, milestone or labels if user is guestDmitriy Zaporozhets2015-06-255-0/+18
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Updated merge request merged web hook to correctly fire action=merged.Adam Meily2015-06-241-1/+1
| | | | | Fixes #879 Fixes #498
* Fix error when deleting a user who has projectsStan Hu2015-06-231-0/+6
| | | | | Closes #1856 Closes https://github.com/gitlabhq/gitlabhq/issues/9394
* Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-223-3/+3
|
* Merge branch 'fix-ext-issue-webbased-hooks' into 'master'Douwe Maan2015-06-161-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hooks for web based events with external issue references The creation of cross references for external issues (which would fail) is now prevented. This fixes a 500 error and the execution of hooks when creating a merge request or commenting on one. Fixes #1650, GH-9333. This regression might have been introduced by 8f8a8ab32bca8fdc79d7a5115eabbd015dd44c02. There is actually a TODO by @rspeicher mentioning external issues which is lost (unhandled) in a later commit. This fix is related to !766 and !804 which fix a similar issue for hooks for Git based events. See merge request !794
| * Fix hooks for web based events with external issue referencesDaniel Gerhardt2015-06-141-1/+3
| | | | | | | | | | | | | | The creation of cross references for external issues (which would fail) is now prevented. Fixes #1650, GH-9333.
* | Merge branch 'fix-post-receive-external-tracker' into 'master'Douwe Maan2015-06-152-11/+17
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix post-receive errors on a push when an external issue tracker is configured ### What does this MR do? This MR improves upon !766, fixing errors upon a git push that occur only when an external issue tracker (not JIRA) is used. This MR takes into account that external issue trackers, such as JIRA, may close issues. Disabling the processing of post-receive commits when an external issue tracker is configured seems like the wrong behavior. ### Why was this MR needed? When a user adds an issue reference, the refactoring in 8f8a8ab and a6defd157 caused `project.get_issue` to be called, causing `ExternalIssue` to be returned when an external issue tracker was configured. This object does not have a `close` method, as needed in `CloseService`. Nor does it make sense to associate a `SystemNote` with this object. GitLab EE uses a [special case for JIRA](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/services/git_push_service.rb#L87). I would recommend moving this logic into `CloseService` too. ### What are the relevant issue numbers? * Closes #1700 * Closes #1720 See merge request !804
| * Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-122-11/+17
| | | | | | | | | | Closes #1700 Closes #1720
* | An `in_namespace` scope is already presentzenati2015-06-091-1/+1
|/
* Merge branch 'refactor-web-editor' into 'master'Dmitriy Zaporozhets2015-06-054-117/+84
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor web editor * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #1761 See merge request !773
| * Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-054-117/+84
| | | | | | | | | | | | | | | | | | | | * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Show warning when a comment will add 10 or more people to the discussion.Douwe Maan2015-06-051-2/+2
|/
* Skip repo removing whem remove user or groupDmitriy Zaporozhets2015-06-033-7/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'repo-remove' into fix-group-removeDmitriy Zaporozhets2015-06-031-13/+52
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
| * Fix tests and increase delay time before remove repositoryDmitriy Zaporozhets2015-06-031-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move repository when project is removedDmitriy Zaporozhets2015-06-031-13/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ths commit does next: * When we remove project we move repository to path+deleted.git * Then we schedule removal of path+deleted with sidekiq * If repository move failed we abort project removal This should help us with NFS issue when project get removed but repository stayed. The full explanation of problem is below: * rm -rf project.git * rm -rf removes project.git/objects/foo * NFS server renames foo to foo.nfsXXXX because some NFS client (think * Unicorn) still has the file open * rm -rf exits, but project.git/objects/foo.nfsXXX still exists * Unicorn closes the file, the NFS client closes the file (foo), and the * NFS server removes foo.nfsXXX * the directory project.git/objects/ still exists => problem So now we move repository and even if repository removal failed Repository directory is moved so no bugs with project removed but repository directory taken. User still able to create new project with same name. From administrator perspective you can easily find stalled repositories by searching `*+deleted.git` Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove projects before group/user. Remove namespace directory asyncfix-group-removeDmitriy Zaporozhets2015-06-032-0/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Wrap group removal into serviceDmitriy Zaporozhets2015-06-031-0/+11
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make web editor work correctly after switch from satellitesDmitriy Zaporozhets2015-06-025-5/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>