diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-03-20 14:57:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-03-20 14:57:25 +0100 |
| commit | 2eb19ea3ea36916bbea72a8ccab3e6d15f602ac9 (patch) | |
| tree | 55c08bbb50e92ce76028f68a5267401a76bc4b02 /app/services/projects | |
| parent | 8b830b8c3b32774e8ccf562b8bc9dbce3ecf3073 (diff) | |
| parent | 01fe50a72513a88f2168c8c0a649661b1382a42b (diff) | |
| download | gitlab-ce-2eb19ea3ea36916bbea72a8ccab3e6d15f602ac9.tar.gz | |
Merge branch 'master' into issue_12658
Diffstat (limited to 'app/services/projects')
| -rw-r--r-- | app/services/projects/autocomplete_service.rb | 6 | ||||
| -rw-r--r-- | app/services/projects/housekeeping_service.rb | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb index 7408e09ed1e..ba50305dbd5 100644 --- a/app/services/projects/autocomplete_service.rb +++ b/app/services/projects/autocomplete_service.rb @@ -1,11 +1,7 @@ module Projects class AutocompleteService < BaseService - def initialize(project) - @project = project - end - def issues - @project.issues.opened.select([:iid, :title]) + @project.issues.visible_to_user(current_user).opened.select([:iid, :title]) end def merge_requests diff --git a/app/services/projects/housekeeping_service.rb b/app/services/projects/housekeeping_service.rb index bccd67d3dbf..a0973c5d260 100644 --- a/app/services/projects/housekeeping_service.rb +++ b/app/services/projects/housekeeping_service.rb @@ -24,7 +24,7 @@ module Projects def execute raise LeaseTaken if !try_obtain_lease - GitlabShellWorker.perform_async(:gc, @project.path_with_namespace) + GitlabShellOneShotWorker.perform_async(:gc, @project.path_with_namespace) ensure @project.update_column(:pushes_since_gc, 0) end |
