Skip to content
This repository
  • 306 commits
  • 192 files changed
  • 34 comments
  • 49 contributors
This comparison is big! We're only showing the most recent 250 commits
Aug 30, 2011
Santiago Pastorino Bump sprockets up 36352ca
Aaron Patterson Merge branch '3-1-0' into 3-1-stable
* 3-1-0:
  bumping to 3.1.0
  Bump sprockets up
  Depend on sass-rails and coffee-rails 3.1.0
  Revert "Merge pull request #2647 from dmathieu/no_rescue"
  Merge pull request #2756 from guilleiguaran/manifest-location
  Merge pull request #2748 from guilleiguaran/assets-version-config
  adds the asset pipeline guide to the index
  incorporate feedback from vijaydev and dasch to rephrase this to sound more natural, and some grammar fixes.
7cdc9fd
Chris Griego Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them …
…public." to support date implementations without private to_date/to_datetime on Time (home_run).

This reverts commit 080345b.
e63c638
Aaron Patterson Merge pull request #2760 from cgriego/home_run
Fix ActiveSupport compatibility with home_run
403dc11
Aaron Patterson adding changelog dates 5c5021f
Aug 31, 2011
Guillermo Iguaran Update Assets guide to reflect all the new changes 1cda269
Xavier Noria adds the release notes of 3.1 to the index dc5957a
Xavier Noria release notes: adds a couple of blank lines to get the markup right 417c31c
Xavier Noria Merge pull request #2762 from guilleiguaran/assets-documentation
Assets Guide updates
271cf98
Ray Baxter don't need edgeapi now that we are on 3.1 57dd60f
Guillermo Iguaran Always enable digest and compile in the Rake task 3f29342
José Valim Merge pull request #2768 from guilleiguaran/fix-assets-rake-task
Always enable digest and compile in the Rake task
d6a0078
Aaron Patterson Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable
* '3-1-stable' of github.com:rails/rails:
  Always enable digest and compile in the Rake task
  don't need edgeapi now that we are on 3.1
  release notes: adds a couple of blank lines to get the markup right
  adds the release notes of 3.1 to the index
  Update Assets guide to reflect all the new changes
  Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them public." to support date implementations without private to_date/to_datetime on Time (home_run).
8812807
David Heinemeier Hansson Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore
Add .rbenv-version to .gitignore
15b75b4
Richard Hulse Add section to pipeline docs to help people upgrading
These are the options from a brand new app, and
should help people get it right when upgrading.
8bb9bb2
Xavier Noria Merge pull request #2779 from kirs/3-1-stable
Nginx and Apache configs to serve precompiled gzip assets were added to Asset Pipeline Guide
c45ce6e
Guillermo Iguaran Manifest should be nil by default. Closes #2776 a4b7363
Guillermo Iguaran Remove deprecated code used only in Sprockets < 2.0.0.beta.15 e7a86b9
Santiago Pastorino Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-cha…
…nges

Assets pipeline: fix in manifest location and remove unused code
c2a323d
Sep 01, 2011
Vijay Dev doc fixes d3d2cea
Kir Shatrov Instructions for nginx and apache added 3fb0579
Guillermo Iguaran Add missing changelog entries for 3.1.1 08f46b6
Sam Pohlenz Move references to Rails.application.config out of Sprockets AssetPaths 6bc6978
José Valim Merge pull request #2784 from guilleiguaran/changelog-3-1-1
Add missing changelog entries for 3.1.1
6ba9aa7
José Valim Merge pull request #2785 from spohlenz/extract-asset-paths-config
Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper
9bfaef0
Sam Pohlenz assets:precompile should not append asset digests when config.assets.…
…digest is false
a5619c0
José Valim Merge pull request #2782 from spohlenz/precompile-without-digests
assets:precompile should not append asset digests when config.assets.digest is false
8b049a1
Tom Stuart Improve content_for test coverage b149021
Tom Stuart Never return stored content from content_for when a block is given
The capture helper may return nil when evaluation of the block has
produced a buffer which contains only whitespace, but that doesn't
mean content_for should return stored content.
f49faeb
Aaron Patterson CookieJar is enumerable. fixes #2795 af7c9b9
Aaron Patterson make sure encoding_aware? is available 3afa90d
Aaron Patterson * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731 e46c4f1
Aaron Patterson preserve the backtrace of the exception e6fd4ed
Sep 02, 2011
Jon Leighton Add missing CHANGELOG entry. Closes #2791. c0ae44c
Guillermo Iguaran Remove hard dependency on bcrypt. 2b15762
Sep 03, 2011
Xavier Noria syncs asset pipeline guide with master e7ee2a9
Arun Agrawal pg does not allow aliases in the having clause, but functions are fine e7eba93
Arun Agrawal Warning removed. df01e2e
Vijay Dev Merge pull request #2830 from arunagw/warning_removed_3-1-stable
Warning removed 3 1 stable
e491444
Arun Agrawal We need to check here for the table name.
Abstract classes are having nil class name.
So nil.gsub will give a error here.
891d0d7
Aaron Patterson Merge pull request #2831 from arunagw/pg_abstract_class_fix
Fixed test for 3-1-stable. Abstract class is having nil class name.
e835aa0
Aaron Patterson Merge pull request #2829 from arunagw/pg_min_fix
pg does not allow aliases in the having clause, but functions are fine
66754c4
Aaron Patterson Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments
Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile
b7a62f2
Guillermo Iguaran Add entry about bcrypt-ruby remove to ActiveModel changelog 0a6de72
Aaron Patterson Merge pull request #2826 from guilleiguaran/changelog-remove-bcrypt
Changelog entry about remove of bcrypt as hard dependency on ActiveModel
459e62a
Guillermo Iguaran Include ticket numbers in CHANGELOG d3b7c34
Santiago Pastorino Merge pull request #2835 from guilleiguaran/actionpack-changelog
Include ticket numbers in AP CHANGELOG
caec291
Xavier Noria restores the API docs of AR::Fixtures, made a quick pass over them, r…
…evises link in fixture template [closes #2840]

Conflicts:

	activerecord/lib/active_record/fixtures.rb
45f0dc4
Santiago Pastorino Merge pull request #2843 from arunagw/warnings_removed_for_test_3-1-s…
…table

Warnings removed for test 3 1 stable
4fa403c
Sep 04, 2011
Richard Hulse Added new asset config options to guides ce5b559
Guillermo Iguaran Review config.assets options. ba75385
Arun Agrawal Warnings removed for unused variables.
Warnings removed for using shadow variable.
2a959d8
Arun Agrawal Warnings removed for "assert_match /" Please do
not add more.!
009a0f8
Arun Agrawal Modified content in guides and comments
for "assert /" warnings.
Removed because if somebody will use this code 
they will get warnings!
9859928
Arun Agrawal stop circular require warnings f397ced
Santiago Pastorino Remove useless parens 04c25a7
Arun Agrawal require bcrypt to pass the test 8be13b5
Jon Leighton Merge pull request #2846 from arunagw/bcrypt_3-1-stable
Bcrypt 3 1 stable
000fee7
Arun Agrawal We can't simply check the first line of the
backtrace, because JRuby reports the call 
to __send__ in the backtrace.

In JRuby first is "org/jruby/RubyKernel.java"
5df885e
Jon Leighton Merge pull request #2849 from arunagw/jruby_activesupport_fix_3-1-stable
Jruby activesupport fix 3 1 stable for JRuby
df3360f
Vijay Dev add some missing dots in the docs c0b73b5
Vijay Dev minor fixes in assets guide 9ef943c
Arun Agrawal We need to recorder here. Need to drop the order from default scope.
Fixes #2832
e8761b3
Jon Leighton Merge pull request #2850 from arunagw/find_in_batch_fix
Find in batch fix
6be4deb
Jon Leighton Merge pull request #2854 from arunagw/find_in_batches_changelog
Find in batches changelog
6abb8c9
Santiago Pastorino * is not allowed in windows file names. Closes #2574 #2847 ba13004
Santiago Pastorino Merge pull request #2860 from guilleiguaran/fix-assets-behavior
Fix AssetNotPrecompiledError behavior
3250c7f
Santiago Pastorino Merge pull request #2861 from guilleiguaran/assets-fix-changelog
Add entry about Asset behaviour fix to ActionPack ChangeLog
1458ada
Sep 05, 2011
Arun Agrawal Changelog updated for find_in_batches fix. c0f73be
Arun Agrawal Sort here to make sure the order is ok. 1b1bd6c
Jon Leighton Merge pull request #2867 from arunagw/batches_test_pg_3-1-stable
Need to make sure about order here.
0b7a1f8
Santiago Pastorino Merge pull request #2799 from tomstuart/3-1-stable
Never return stored content from content_for when a block is given
a2baf03
Damien Mathieu Backport #2789 and add changelog entry 327fa94
Santiago Pastorino Merge pull request #2873 from guilleiguaran/remove-unused-config
Remove unused config variable from test.rb template
4b39d4d
Jon Leighton Merge pull request #2871 from dmathieu/limit-3-1-stable
Backport #2789 to 3-1-stable
76d3b47
Prem Sichanugrist Make `ActiveSupport::OrderedHash` extractable when using `Array#extra…
…ct_options!`

`ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list.
d1a2701
Santiago Pastorino Merge pull request #2874 from sikachu/3-1-stable-extractable_ordered_…
…hash

Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!`
a7f5532
Georg Friedrich Don't find belongs_to target when the foreign_key is NULL. Fixes #2828 78c896c
Aaron Patterson Merge pull request #2716 from jbbarth/fix_invert_rename_index
Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index
c33b7c4
Santiago Pastorino Merge pull request #2877 from dmathieu/fix_tests_pg_18
Last orders the records by id
d194397
Santiago Pastorino Merge pull request #2870 from arunagw/uglifier_bump
Uglifier bump
10f2c01
Santiago Pastorino Bump uglifier up b949fde
Sep 06, 2011
Jon Leighton Add CHANGELOG entry for 78c896c 431d766
Damien Mathieu #first doesn't take an order in this test 679a4eb
Jon Leighton Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, a…
…s they have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys.
bf27792
Jon Leighton Use broken YAML that will fail with Syck as well as Psych. Fixes test…
…_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
b8d4692
Jon Leighton Ensure we are not comparing a string with a symbol in HasManyAssociat…
…ion#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be.
a48e332
Jon Leighton Nested through associations: preloads from the default scope of a thr…
…ough model should not be included in the association scope. (We're already excluding includes.) Fixes #2834.
d4b9829
Santiago Pastorino Merge pull request #2889 from guilleiguaran/perform-caching-assets
config.action_controller.perform_caching isn't used anymore in asset pipeline
a22701e
Santiago Pastorino Merge pull request #2577 from rails-noob/master
Fix double slash at start of paths when mounting an engine at the root.
699b83a
Rhett Sutphin Completely remove the pool when removing a connection. Fixes #2820. c5af3a6
Aaron Patterson adding a statement pool for mysql and sqlite3 b37112f
Aaron Patterson Database adapters use a statement pool.
Database adapters use a statement pool for limiting the number of open
prepared statments on the database.  The limit defaults to 1000, but can
be adjusted in your database config by changing 'statement_limit'.
7c04e16
Aaron Patterson updating changelog with pool limit de03d4f
Aaron Patterson Eliminate newlines in basic auth. fixes #2882 9959233
Aaron Patterson updating changelog 4263a79
Aaron Patterson Merge pull request #2897 from rsutphin/ar31-remove_connection
Patch for issue #2820
9198c7a
Sep 07, 2011
Kym McInerney Postgresql adapter: added current_schema check for table_exists? 81a19c4
Kym McInerney Postgresql adapter: added current_schema check for table_exists? 6a14b01
Jon Leighton Don't include any of includes, preload, joins, eager_load in the thro…
…ugh association scope.
df21e3d
Santiago Pastorino Merge pull request #2904 from guilleiguaran/refactor-assets-tests
Refactor assets tests to use add_to_config
759f3e5
Tim Lucas Make sure require_tzinfo only calls Kernel#require if TZInfo isn't al…
…ready present.

This wasn't a problem when require_tzinfo was only called from TimeZone#initialize, but now it's being called for every lookup to TimeZone.[] (via lazy_zones_map)

TimeZone lookup can occur when unmarshalling TimeWithZone objects, which is where I first saw the big slowdown (500ms for each Rails action that loaded from Rails.cache)
d6d4740
Aaron Patterson Merge pull request #2913 from toolmantim/3-1-stable
Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already present
4a2e619
Aaron Patterson Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails
…into rawr

* https://github.com/rails/rails:
  Postgresql adapter: added current_schema check for table_exists?
  Postgresql adapter: added current_schema check for table_exists?
a6178c3
Aaron Patterson use the supplied bind values 76993f6
Andrew Kaspick fix exists? to return false if passed nil (which may come from a miss…
…ing URL param)
44a5849
Andrew Kaspick entry for fixing exists? 8f2f39b
Santiago Pastorino Merge pull request #2921 from akaspick/exists_fix_3_1
fix exists? to return false if passed nil (backport to 3-1-stable)
6a18262
Andrew Kaspick fix assert_select_email to work on non-multipart emails as well as co…
…nverting the Mail::Body to a string to prevent errors.
05d4d8b
Andrew Kaspick assert_select_email fix entry 954543e
Jon Leighton Merge pull request #2926 from akaspick/assert_select_email_fix_3_1
assert_select_email fix for 3-1-stable
866303d
Aaron Patterson LRU should cache per process in postgresql. fixes #1339 77e0bdd
Aaron Patterson fixing file name 24b3783
Aaron Patterson LRU cache in mysql and sqlite are now per-process caches. b92a025
Sep 08, 2011
Guillermo Iguaran Add JavaScript and ERB section to Asset Guide 2451a68
Guillermo Iguaran Add CoffeeScript example to JavaScript and ERB section abb0af1
Guillermo Iguaran Add reference about "bundle install --without assets" in Precompiling…
… Assets section.
8461804
Uģis Ozols Change hyphen to underscore. 7e587c2
Marcus Ilgner Fixed Apache configuration for gzipped assets: FilesMatch and Locatio…
…nMatch cannot be nested.
ac60460
Added note about adding a javascript runtime to Gemfile for productio…
…n environment.
fa6bfce
Vijay Dev copy edit assets guide 5ed3e6a
Joel Moss db:migrate:status correctly uses ActiveRecord::Migrator.migrations_pa…
…ths instead of only the apps db/migrate directory, which will include engine migrations.
dffd058
Jon Leighton Remove failing test which was wrongly introduced.
This test was introduced in pull request #2577. The author of the pull
request included the test, which was originally in #2230, at the same
time as fixing a separate (but related) bug. However, the author did not
include a fix for this test, so when #2577 was merged, a failing test
was introduced.

So I am removing the failing test for now. If anyone wants to fix the
bug, please do so and submit a complete pull request with a test and
a fix.
562277b
Sep 10, 2011
Santiago Pastorino Merge pull request #2876 from alex3/patch-1
Fixed assets precompile regex
082f53a
Santiago Pastorino Merge pull request #2957 from waseem/migration_status_tests
Tests for rake db:migrate:status.
7317f6c
Arun Agrawal Adding assert for "test_form_for_with_isolated_namespaced_model" 38c7a67
Arun Agrawal Warnings removed unused variables. Please don't add them 1ca38c6
Santiago Pastorino Merge pull request #2967 from arunagw/add_missing_assert
Add missing assert
f8c4519
Santiago Pastorino Merge pull request #2970 from deepakprasanna/master
Added a case to check the status of the migration after a rollback and redo.
c0775c6
Xavier Noria clarify that documentation bugs have to be reported as Rails issues. …
…[Closes #2858]
a7998dc
Sep 11, 2011
dharmatech getting_started.textile section 6: Correct file names in table fbcff81
Vijay Dev some copy-edits 06ed248
Michael Laing Update to conform to rails 3.1 generated caode 04767d1
Andy Lindeman Fix for :instance_reader => false code example b9c66fa
Emin Hasanov Fix typo in "must-revalidate" header name df761ba
Santiago Pastorino Merge pull request #2969 from arunagw/warnings_removed_3_1_stable
Warnings removed 3 1 stable
96d63e1
Santiago Pastorino Merge pull request #2936 from joelmoss/migration_status
db:migrate:status not looking at all migration paths
90cd024
Sep 12, 2011
Sidu Ponnappa Issue #636 - Parsing an xml file with multiple records and extra attr…
…ibutes (besides type) fails
981f076
José Valim Merge pull request #2983 from sikachu/3-1-stable-hash-backported
Issue #636 - Parsing an xml file with multiple records and extra attribut
112c730
José Valim Revert "Copy the bin to railties so it also works if you don't have t…
…he rails gem."

This reverts commit 20db687.
91f549b
José Valim Remove rails executable from the gemspec. a299105
John Mileham ActiveResource shouldn't rely on the presence of Content-Length 184d8a2
Santiago Pastorino Merge pull request #2985 from kennyj/master
fix #2582 (with testcase)
7e26ab1
Santiago Pastorino Merge pull request #2988 from guilleiguaran/remove-extra-line
Remove odd asignation
79509a2
Santiago Pastorino Merge pull request #2987 from kennyj/master 8c3f6f6
Sep 13, 2011
Santiago Pastorino Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets c289dea
Santiago Pastorino always rewrite_relative_url_root f79fac5
Guillermo Iguaran Backport e767cda (move assets tests to assets_test file) 3d042fa
Santiago Pastorino Merge pull request #2997 from guilleiguaran/move-assets-test-3-1-stable
Backport e767cda (move assets tests to assets_test file) to 3-1-stable
ecf38fe
Santiago Pastorino Merge pull request #3000 from guilleiguaran/fix-relative-url-root
Fix for relative url root in assets
bb93687
Santiago Pastorino Merge pull request #3001 from guilleiguaran/fix-assets-precompile-hos…
…t-test

Fix precompile asset_host test
874e012
Santiago Pastorino Fix asset_path relative_url_root method a244ad4
Vijay Dev merged the contribution guides and changed the
link in the layout accordingly
330d426
Vijay Dev change GH issue tracker url 01378f3
Vijay Dev Delete contribute.textile now that its contents are merged to the con…
…tributing_to_ruby_on_rails guide
59ba0dd
Mike Gunderloy Fix typo 4e4783f
Alan Zeino Slight change to reflect current 'destroy' code generated by scaffold…
… in 3.1 release.
c3751a4
Semyon Perepelitsa Fix a typo in date e66dd14
dharmatech getting_started.textile: Fix typos in section "Rendering a Partial Form" fbde94a
dharmatech getting_started.textile: Fix typo and split up a sentence in section …
…"Building a Multi-Model Form"
f74a4d8
Aaron Patterson Merge pull request #2922 from wayneeseguin/master
Include ActiveRecord SQLServer Adapter by @metaskills in new application generator.
7ee8be5
Santiago Pastorino Provide a way to access to assets without using the digest, useful fo…
…r static files and emails
65cf784
Santiago Pastorino Merge pull request #3011 from guilleiguaran/disable-sprockets-server
Don't mount Sprockets if config.assets.compile is disabled
058593d
Sep 14, 2011
Santiago Pastorino Revert "Provide a way to access to assets without using the digest, u…
…seful for static files and emails"

This reverts commit 82afaa0.
f85cd49
Santiago Pastorino Merge pull request #3012 from guilleiguaran/3-1-1-changelogs
Add missing changelog entries for actionpack
511070f
José Valim Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precom…
…pile

Clear cache before of each precompile to avoid inconsistencies. Fixes #3014
499ea51
Santiago Pastorino Allow asset tag helper methods to accept :digest => false option in o…
…rder to completely avoid the digest generation.
64de4dd
Santiago Pastorino Add some CHANGELOG missing stuff ae6c555
Santiago Pastorino Bumping up to 3.1.1.rc1 3f9665b
Sep 15, 2011
Jaime Iniesta Fix typos and broken link on asset pipeline guide e20d761
Ben Walding Add equivalent nginx configuration 9a2fa21
Hendy Tanata Fix: habtm doesn't respect select query method.
Patch for issue #2923.
8dd3968
Damien Mathieu cherry-pick #1318 into 3-1-stable 5b20d4c
Jon Leighton Merge pull request #3036 from dmathieu/cherry-pick-1318
Cherry pick 1318
06b5182
Sep 16, 2011
José Valim Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-…
…nil-precompile

config.action_controller.asset_host shouldn't set to nil during precompile
6dae0ab
Santiago Pastorino Proper lines numbers for stack trace info 12a7dc4
Sep 17, 2011
Marcus Ilgner Fixed Apache configuration for gzipped assets: FilesMatch and Locatio…
…nMatch cannot be nested.

(cherry picked from commit 5e2bf4d)

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
99f59f9
Andrew White Revert "Fixed Apache configuration for gzipped assets: FilesMatch and…
… LocationMatch cannot be nested."

This reverts commit 99f59f9.
12d4514
Arun Agrawal Bump AR-JDBC version.
THis version is compatible with 3.1 and above
4d2089c
Santiago Pastorino Merge pull request #3056 from arunagw/arjdbc_bump
Arjdbc bump
df97bf5
Santiago Pastorino Merge pull request #3049 from brainopia/fix_to_query_edge_case
Fix Hash#to_query edge case with html_safe string on 1.8 ruby
081d41a
Sep 18, 2011
Arun Agrawal fixed test for JRuby.
for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION
2d4ac4f
Sep 19, 2011
Santiago Pastorino Merge pull request #3060 from arunagw/query_cache_test_3-1-stable
Query cache test 3 1 stable
af46454
Sep 21, 2011
Santiago Pastorino Merge pull request #3065 from brainopia/fix_to_param_test
Fix test to reflect use of to_param for keys
4e37995
Alexey Vakhov update guides, use html safe translations in i18n bcbc484
Guillermo Iguaran Add reference about --skip-sprockets to Asset Pipeline Guide ce758e2
Kir Shatrov "Passing variables into the translation" section added 6867150
Vijay Dev minor edit e3b1d9a
Vijay Dev Fixing incorrect notextile tags cde34fb
Uģis Ozols sass-rails helpers - hyphenated in Sass, underscored in Ruby. a8501c1
Ryan Bigg Document ActiveRecord::QueryMethods#select c7ed6f3
Jan Vlnas Locale code for Czech is ":cs" 5deb664
Vijay Dev remove unnecessary markup f289404
Vijay Dev copy edits 908f261 caf42a8
Vijay Dev copy edits 302e570 03d3063
Santiago Pastorino Add jquery-rails to Gemfile of plugins, test/dummy app uses it.
Closes #3091
ed96ee5
Santiago Pastorino Merge pull request #3081 from guilleiguaran/move-precompile-to-class
Move precompiling from task to Sprockets::StaticCompiler
40a574f
Santiago Pastorino Merge pull request #3027 from alex3/assets-precompile-regex-fix
Default precompile regex was erroneously matching files
49584b2
Sep 22, 2011
Fix named routes modifying arguments
Signed-off-by: José Valim <jose.valim@gmail.com>
d879213
Santiago Pastorino Merge pull request #3096 from phuibonhoa/master
FileStore key_file_path does not properly limit filenames to 255 characters
52edadf
Santiago Pastorino No need to create a range object 1b780cc
Terence Lee AR wants sqlite3 1.3.4 16b8fde
José Valim Merge pull request #3102 from hone/3-1-stable
Bump sqlite3 in Gemfile to 1.3.4
710a284
Terence Lee set env to let rails know we're precompiling d123489
José Valim Merge pull request #3103 from hone/precompile_flag
set env to let rails and co. (read gems) know we're precompiling
9eb628a
Sep 23, 2011
Santiago Pastorino Merge pull request #3092 from asee/master
Sprockets to use config.assets.prefix, with tests
d4f999f
Santiago Pastorino Merge pull request #3115 from guilleiguaran/refactor-rails-helpers
Remove Sprockets compute_public_path, AV compute_plubic_path can be used
f64a352
Sep 24, 2011
José Valim `rake assets:precompile` loads the application but does not initializ…
…e it.

To the app developer, this means configuration add in
config/initializers/* will not be executed.

Plugins developers need to special case their initializers that are
meant to be run in the assets group by adding :group => :assets.
b479889
José Valim Remove the ENV flag, yagni. 2a68867
José Valim Add test for belongs_to? and group initializers. 0a4b8fb
José Valim Avoid using pathnames and automatically create the manifest directory…
… if one does not exist yet.
253c0bc
José Valim Fix spacing on Gemfile. 7f8f1f3
cablegram Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.…
…exec so it works on Windows

The Kernel.exec method launches the current program ($0) after setting some environment variables.  This current ruby script has a shebang line and no .rb in its name. Launching a script this way does not work on Windows. By using the +ruby+ method that is included in Rake, we can launch the current script with the current ruby version and bypass the identified Windows issue.
21f1e45
Santiago Pastorino Revert "Make process reuse the env var passed as argument"
This reverts commit 0e4748c.
3200cd0
Santiago Pastorino Merge pull request #3121 from cablegram/3-1-stable
Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows
6cb0d35
Santiago Pastorino Merge pull request #3123 from avakhov/patch-5-remove-superfluous-to-s
remove superfluous to_s in ERB::Util.html_escape
42c2b24
Sep 25, 2011
Alexey Vakhov escape options for the stylesheet_link_tag method
Signed-off-by: José Valim <jose.valim@gmail.com>
a61d85c
Sep 26, 2011
Jon Leighton CollectionProxy#replace should change the DB records rather than just…
… mutating the array. Fixes #3020.

Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
2d7dd9b
Vijay Dev remove stray line 7d603ff
Jon Leighton Add deprecation for the preload_associations method. Fixes #3022. 6c5295f
Santiago Pastorino image_tag should use /assets if asset pipelining is turned on. Closes #… 0cb84f1
José Valim Encapsulate assets initialization in its own rake task. ef7de0c
Jon Leighton Fix belongs_to polymorphic with custom primary key on target.
Closes #3104.
4aeb7f2
Jon Leighton Forgot CHANGELOG entry. d25bee4
Santiago Pastorino Merge pull request #3135 from christos/respect_assets_digest_value
Give precedence to `config.digest = false` over the existence of manifest.yml asset digests
7e43dee
Santiago Pastorino Just assert_equal here ceb56f3
Jon Leighton Merge pull request #3030 from htanata/fix_habtm_select_query_method
Fix: habtm doesn't respect select query method
5767609
Jon Leighton Add CHANGELOG ecf5584
Guillermo Iguaran Avoid use of existing precompiled assets during rake assets:precompil…
…e run. Closes #3119
b605bd5
Santiago Pastorino Copy assets to nondigested filenames too 6ba472c
Santiago Pastorino Merge pull request #3136 from guilleiguaran/clear-digests-on-precompile
Avoid use of existing precompiled assets during rake assets:precompile run
b703cdb
Santiago Pastorino Merge pull request #3138 from christos/correct_image_path_with_pipeline
Correctly override image_path in sprockets rails_helper
493077c
Jon Leighton Don't require a DB connection when setting primary key.
Closes #2807.
75e97a4
Xavier Noria partial pass over the asset pipeline guide 9f080e4
Sep 27, 2011
Xavier Noria partial pass over the asset pipeline 7ebae12
Xavier Noria the infamous detail only spotted in GitHub diffs no matter how carefu…
…l you were before pushing
76cd9c0
Santiago Pastorino Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require
add missing require to html sanitizer
d6c333c
Sep 28, 2011
Alexey Vakhov fix ActionMailer readme example ef0f6ce
Alexey Vakhov update ActionMailer example using last truncate helper method signature e9de9e2
Nicolás Hock Isaza Alert about the new Bundler require for asset gems
If you are coming from a Rails 3.0 application, you won't have
the correct Bundler require statement.

This will cause the gems under the `assets` group not to be available
in the development and production environment.

I think this is related to the issue #39 in rails-sass
rails/sass-rails#39
0b151a4
Diego Plentz fixing docs for delete_sql where quotes should be used in this example. 0cebbf4
Vijay Dev fixing typo in assets guide d76b79b
Fixed markup error. 8df638d
Xavier Noria partial pass over the assets guide 05f0c41
Santiago Pastorino Merge pull request #3156 from ihower/enhance_button_to_helper_v2
Make button_to helper support "form" option
00f0fb8
Santiago Pastorino javascript_path and stylesheet_path should honor the asset pipelining 7e2de38
Santiago Pastorino Fix tests in 1.8.7 85f8458
Sep 29, 2011
Jon Leighton Don't call self.class unless necessary. Closes #3171. 45c56bd
Santiago Pastorino Add CHANGELOG entries 8aee03b
Santiago Pastorino Bumping to 3.1.1.rc2 aead572