diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/merges_controller.rb | 6 | 
1 files changed, 6 insertions, 0 deletions
| diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb index 663b6e750..99adadafb 100644 --- a/app/controllers/merges_controller.rb +++ b/app/controllers/merges_controller.rb @@ -8,6 +8,12 @@ class MergesController < ChouetteController    before_action :set_mergeable_controllers, only: [:new] +  protected + +  def begin_of_association_chain +    current_organisation +  end +    private    def set_mergeable_controllers | 
