Commits

Show all
Author Commit Message Labels Comments Date
Jon Leighton
Preparing for 3.1.3 release
Jon Leighton
Fix sass-rails dependency. Closes #3704.
Jon Leighton
Downgrade sprockets to 2.0.3. Closes #3686.
Jon Leighton
Perf fix If we're deleting all records in an association, don't add a IN(..) clause to the query. Fixes #3672.
Jon Leighton
Add missing CHANGELOG entry for #3678. Closes #3678.
Jon Leighton
Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. Conflicts: actionpack/CHANGELOG.md
Jon Leighton
Bump sprockets to 2.1.1 Conflicts: actionpack/actionpack.gemspec
kennyj
Use `show index from`. We could fix `pk_and_sequence_for` method's performance problem (GH #3678)
Jon Leighton
Verify that #3690 has been closed by previous changes to the mysql adapters. These tests fail on the v3.1.2 tag. Closes #3690. Conflicts: activerecord/CHANGELOG.md
Jon Leighton
Merge branch '3-1-2' into 3-1-stable
tenderlove
fixing my bad merge. doh!
tenderlove
allow people to set a local .Gemfile so that things like ruby-debug are not required for regular development
Vijay Dev
Merge pull request #3682 from sikachu/3-1-stable-fix_test_variable Update variable's name in the test case to reflect the class we're testing
capps
"denoted" instead of "donated" "parentheses" instead of "use brackets"
Philip Arndt
Fixed typo: expect -> expected
tenderlove
Merge pull request #3683 from christos/schema_introspection_speedup Only used detailed schema introspection when doing a schema dump. Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
Prem Sichanugrist
Update variable's name in the test case to reflect the class we're testing
Jon Leighton
Preparing for 3.1.2 release
Just Lest
_html translation should escape interpolated arguments
Just Lest
_html translation should escape interpolated arguments
José Valim
Merge pull request #3665 from wildchild/label_i18n_3-1-stable Fix impractical I18n lookup in nested fields_for (3-1-stable)
Xavier Noria
Revert "warn the user values are directly interpolated into _html translation strings" Reason: After another round of discussion, it has been decided to let interpolation deal with unsafe strings as it should do. This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b.
Xavier Noria
warn the user values are directly interpolated into _html translation strings
zven
Fix impractical I18n lookup in nested fields_for
Jon Leighton
Switch from marshal format to plain text for the encoding conversions dump. This is for windows compatibility. Fixes #3644.
Jon Leighton
Switch from marshal format to plain text for the encoding conversions dump. This is for windows compatibility. Fixes #3644.
Jon Leighton
Merge pull request #3633 from Juanmcuello/3-1-stable Backport #3232 to 3-1-stable
Jon Leighton
Merge pull request #3633 from Juanmcuello/3-1-stable Backport #3232 to 3-1-stable
Juan Manuel Cuello
Backport #3232 to 3-1-stable. Use the schema_search_path in prepared statements in postgres. Only the tests are backported, the fix was already included by commit 818d285305502cc6191a98400b43633f44394f6e.
Jon Leighton
rake release should push the tag
  1. Prev
  2. Next