diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 19:48:40 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 19:48:40 +0800 |
| commit | 98a4aca6b5ce503543b0e325212265a365e64d75 (patch) | |
| tree | 0c639fc91c9bebc06eecd1e5f0a2764577b97d28 /app/services | |
| parent | 06b4ea243fef27fa79a201148f07c25df375f57d (diff) | |
| parent | d062af91ca10bb0c48136ad9b9204b02d41fdf8c (diff) | |
| download | gitlab-ce-98a4aca6b5ce503543b0e325212265a365e64d75.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
* upstream/master:
Show CI status as Favicon on Pipelines, Job and MR pages
STL file viewer
Wait for the PDF to be loaded before doing anything
remove unnecessary lease as cron job
Search for opened MRs - include reopened MRs
ProjectsFinder should handle more options
Clearly show who triggered the pipeline in email
Make it possible to preview pipeline success/failed emails
Add remove_concurrent_index to database helper
fix project authorizations migration issue
attempt to fix migration
Revert schema.rb
attempt to fix db failure
Periodically mark projects that are stuck in importing as failed
Fix html structure to prevent tooltip from not hidding
Enable creation of deploy keys with write access via the API
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 2 | ||||
| -rw-r--r-- | app/services/search/global_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 5a53b973059..582d5c47b66 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -39,7 +39,7 @@ module MergeRequests private # Returns all origin and fork merge requests from `@project` satisfying passed arguments. - def merge_requests_for(source_branch, mr_states: [:opened]) + def merge_requests_for(source_branch, mr_states: [:opened, :reopened]) MergeRequest .with_state(mr_states) .where(source_branch: source_branch, source_project_id: @project.id) diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb index c1549df5ac6..8409b592b72 100644 --- a/app/services/search/global_service.rb +++ b/app/services/search/global_service.rb @@ -8,7 +8,7 @@ module Search def execute group = Group.find_by(id: params[:group_id]) if params[:group_id].present? - projects = ProjectsFinder.new.execute(current_user) + projects = ProjectsFinder.new(current_user: current_user).execute if group projects = projects.inside_path(group.full_path) |