Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #5961 - access the Dynflow world after it had been initialized #4166

Merged
merged 1 commit into from
May 28, 2014
Merged

Fixes #5961 - access the Dynflow world after it had been initialized #4166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion katello.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
gem.add_dependency "tire", "~> 0.6.2"
gem.add_dependency "logging", ">= 1.8.0"
gem.add_dependency "hooks"
gem.add_dependency "foreman-tasks", "~> 0.5.0"
gem.add_dependency "foreman-tasks", "~> 0.5.7"
gem.add_dependency "justified"
gem.add_dependency "strong_parameters", "~> 0.2.1" # remove after we upgrade to Rails 4

Expand Down
4 changes: 3 additions & 1 deletion lib/katello/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ class Engine < ::Rails::Engine
# We don't enable this in test env, as it adds the new field into the actions input
# that we are not interested in tests
unless Rails.env.test?
ForemanTasks.dynflow.world.middleware.use ::Actions::Middleware::KeepLocale
ForemanTasks.dynflow.config.on_init do |world|
world.middleware.use ::Actions::Middleware::KeepLocale
end
end
end

Expand Down
4 changes: 2 additions & 2 deletions rubygem-katello.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Requires: %{?scl_prefix}rubygem-tire => 0.6.2
Requires: %{?scl_prefix}rubygem-tire < 0.7
Requires: %{?scl_prefix}rubygem-logging >= 1.8.0
Requires: %{?scl_prefix}rubygem-hooks
Requires: %{?scl_prefix}rubygem-foreman-tasks >= 0.5.0
Requires: %{?scl_prefix}rubygem-foreman-tasks >= 0.5.7
Requires: %{?scl_prefix}rubygem-justified
Requires: %{?scl_prefix}rubygem-delayed_job => 3.0.2
Requires: %{?scl_prefix}rubygem-delayed_job < 3.1
Expand Down Expand Up @@ -152,7 +152,7 @@ BuildRequires: %{?scl_prefix}rubygem-tire => 0.6.2
BuildRequires: %{?scl_prefix}rubygem-tire < 0.7
BuildRequires: %{?scl_prefix}rubygem-logging >= 1.8.0
BuildRequires: %{?scl_prefix}rubygem-hooks
BuildRequires: %{?scl_prefix}rubygem-foreman-tasks >= 0.5.0
BuildRequires: %{?scl_prefix}rubygem-foreman-tasks >= 0.5.7
BuildRequires: %{?scl_prefix}rubygem-justified
BuildRequires: %{?scl_prefix}rubygem-delayed_job => 3.0.2
BuildRequires: %{?scl_prefix}rubygem-delayed_job < 3.1
Expand Down