diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-10-05 11:29:38 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-10-05 11:29:38 +0300 |
| commit | 33cf61716446c9fd1295f8a80bfeb2e600bd8f7d (patch) | |
| tree | eb822c06ec5cc3ec0e5adef6a270fdd72fc54b1d /lib | |
| parent | a545703e739fea0b7d79cc8f0d59e0a64c0eb15b (diff) | |
| parent | 1e9003f4a42fa75b25045701fec5e9aa32cae71a (diff) | |
Merge branch 'master' into feature/gb/pipeline-only-except-with-modified-paths
* master:
Require spec helpers loaded by other spec helpers first
Resolve "2FA mobile options should be rephrased"
Add css class to Admin > Project > show page
Trim whitespace when inviting a new user by email
Bump Gitaly to v0.124.0
Banzai project ref- share context more aggresively
Add reliable fetcher for Sidekiq
Allows to filter issues by `Any milestone` in the API
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/cross_project_reference.rb | 1 | ||||
| -rw-r--r-- | lib/banzai/filter/label_reference_filter.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/banzai/cross_project_reference.rb b/lib/banzai/cross_project_reference.rb index 3f1e95d4cc0..43f913a8859 100644 --- a/lib/banzai/cross_project_reference.rb +++ b/lib/banzai/cross_project_reference.rb @@ -13,6 +13,7 @@ module Banzai # Returns a Project, or nil if the reference can't be found def parent_from_ref(ref) return context[:project] || context[:group] unless ref + return context[:project] if context[:project]&.full_path == ref Project.find_by_full_path(ref) end diff --git a/lib/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb index b92e9e55bb9..04ec38209c7 100644 --- a/lib/banzai/filter/label_reference_filter.rb +++ b/lib/banzai/filter/label_reference_filter.rb @@ -48,7 +48,7 @@ module Banzai include_ancestor_groups: true, only_group_labels: true } else - { project_id: parent.id, + { project: parent, include_ancestor_groups: true } end |