Skip to content

Commit

Permalink
Merge pull request #5824 from juliancheal/try_rails_5_2
Browse files Browse the repository at this point in the history
Loosen Rails dependency for Rails 5.2
  • Loading branch information
mzazrivec authored Aug 30, 2019
2 parents 6729de8 + f7cd8f6 commit 3310bee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/controllers/ops_controller/ops_rbac.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ def valid_tenant?(tenant_id)
end

def valid_role?(user_role_id)
Rbac::Filterer.filtered_object(user_role_id, :class => MiqUserRole).present?
Rbac::Filterer.filtered_object(user_role_id, :class => "MiqUserRole").present?
end

# Get variables from group edit form
Expand Down
2 changes: 1 addition & 1 deletion manageiq-ui-classic.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency "rails", ">= 5.0.0.1", "< 5.2"
s.add_dependency "rails", ">= 5.0.0.1", "< 5.3"

s.add_dependency "coffee-rails"
s.add_dependency "font-fabulous", "~> 1.0.5"
Expand Down

0 comments on commit 3310bee

Please sign in to comment.