Merge branch 'master' into preload
* master: (62 commits) Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag Add CHANGELOG entry for #12344 Add regression test to #12343 Fix typo in number_to_human docs: you -> your [Documentation] Add a missing validation to I18n docs Use the given name in html_options for the hidden field in collection_check_boxes assign_attributes should return if argument is blank. No need the else clause Use join to concat the both side of the AST Add a CHANGELOG entry about Web Console inclusion added column type to example in section 2.3 Include web-console in new projects Gemfile ActiveRecord::ConnectionAdapters::Column.string_to_time method respects string with timezone. Closes #12278. add test_scoped_root_as_name Getting Started Guide: update RubyGems Guides link [ci skip] Deprecate unused quoted_locking_column method. Update references to wycats/thor to erikhuda/thor. bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows Fix the model name in the association basics guides We shouldn't override PostgreSQLAdapter's superclass inheritance while monkeypatching ...
Showing
... | ... | @@ -8,7 +8,7 @@ gemspec |
gem 'mocha', '~> 0.14', require: false | ||
gem 'rack-cache', '~> 1.2' | ||
gem 'bcrypt-ruby', '~> 3.1.0' | ||
gem 'bcrypt-ruby', '~> 3.1.2' | ||
gem 'jquery-rails', '~> 2.2.0' | ||
gem 'turbolinks' | ||
gem 'coffee-rails', '~> 4.0.0' | ||
... | ... |
想要评论请 注册 或 登录