Merge branch 'master' into normalizecb
* master: (61 commits) add tests for reset_calbacks Fixing build broken by this change Extract variable out of loop Updated comment to Rails 4 Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext better error message when app name is not passed in `rails new` Code cleanup for ActionDispatch::Flash#call Fix typo: require -> requires Add CHANGELOG entry for #10576 Merge pull request #10556 from Empact/deprecate-schema-statements-distinct Some editorial changes on the documentation. respond_to -> respond to in a message from AM::Lint specify that dom_(id|class) are deprecated in controllers, views are fine copy edits [ci skip] Fix class and method name typos Replace multi_json with json ruby -> Ruby Adding documentation to the automatic inverse_of finder. Improve CHANGELOG entry [ci kip] Call assume_migrated_upto_version on connection ... Conflicts: activesupport/lib/active_support/callbacks.rb
Showing
... | ... | @@ -60,11 +60,6 @@ platforms :jruby do |
gem 'json' | ||
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7' | ||
# This is needed by now to let tests work on JRuby | ||
# TODO: When the JRuby guys merge jruby-openssl in | ||
# jruby this will be removed | ||
gem 'jruby-openssl' | ||
group :db do | ||
gem 'activerecord-jdbcmysql-adapter', '>= 1.2.7' | ||
gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.7' | ||
... | ... |
想要评论请 注册 或 登录