Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: rails/rails
...
head fork: rails/rails
Commits on Nov 14, 2011
Jon Leighton jonleighton Put sass-rails 3.1.5.rc.2 in the default Gemfile.
Otherwise there will be dependency conflicts with sprockets.
307a9e2
Jon Leighton jonleighton rake release should push the tag 798a3c1
Commits on Nov 15, 2011
Juan M. Cuello Juanmcuello 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 818d285.
b02daec
Jon Leighton jonleighton Merge pull request #3633 from Juanmcuello/3-1-stable
Backport #3232 to 3-1-stable
17c84c5
Commits on Nov 16, 2011
Jon Leighton jonleighton Switch from marshal format to plain text for the encoding conversions…
… dump. This is for windows compatibility. Fixes #3644.
f754f3d
Commits on Nov 17, 2011
Alexander wildchild Fix impractical I18n lookup in nested fields_for 1d8c576
Xavier Noria fxn warn the user values are directly interpolated into _html translation…
… strings
eb46afa
Xavier Noria fxn Revert "warn the user values are directly interpolated into _html tra…
…nslation 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 d57d809.
3bcb247
José Valim josevalim Merge pull request #3665 from wildchild/label_i18n_3-1-stable
Fix impractical I18n lookup in nested fields_for (3-1-stable)
78f649e
Sergey Nartimov lest _html translation should escape interpolated arguments 1b527d7
Commits on Nov 18, 2011
Prem Sichanugrist sikachu Update variable's name in the test case to reflect the class we're te…
…sting
fc44737
Aaron Patterson 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
a31a805
Philip Arndt parndt Fixed typo: expect -> expected b7fe7c3
capps "denoted" instead of "donated"
"parentheses" instead of "use brackets"
ae4974a
Vijay Dev vijaydev 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
a099116
Aaron Patterson tenderlove allow people to set a local .Gemfile so that things like ruby-debug a…
…re not required for regular development
8fedb5f
Aaron Patterson tenderlove fixing my bad merge. doh! 9848b47
Commits on Nov 19, 2011
Jon Leighton jonleighton Merge branch '3-1-2' into 3-1-stable 8f4f8db
Jon Leighton jonleighton 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
c5197d4
Toshinori Kajihara kennyj Use `show index from`. We could fix `pk_and_sequence_for` method's pe…
…rformance problem (GH #3678)
1b2d546
Jon Leighton jonleighton Bump sprockets to 2.1.1
Conflicts:

	actionpack/actionpack.gemspec
3b6087e
Jon Leighton jonleighton Don't html-escape the :count option to translate if it's a Numeric. F…
…ixes #3685.

Conflicts:

	actionpack/CHANGELOG.md
1edef70
Jon Leighton jonleighton Add missing CHANGELOG entry for #3678. Closes #3678. da327fc
Jon Leighton jonleighton Perf fix
If we're deleting all records in an association, don't add a IN(..)
clause to the query.

Fixes #3672.
cb0c3e4
Commits on Nov 20, 2011
Jon Leighton jonleighton Downgrade sprockets to 2.0.3. Closes #3686. 574ed06
Jon Leighton jonleighton Fix sass-rails dependency. Closes #3704. 36cefec
Jon Leighton jonleighton Preparing for 3.1.3 release e9474c8
Something went wrong with that request. Please try again.