Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
This comparison is big! We’re only showing the most recent 250 commits
Commits on Sep 03, 2011
@spastorino spastorino Merge pull request #2835 from guilleiguaran/actionpack-changelog
Include ticket numbers in AP CHANGELOG
caec291
@fxn fxn 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
Commits on Sep 04, 2011
@arunagw arunagw Warnings removed for unused variables.
Warnings removed for using shadow variable.
2a959d8
@arunagw arunagw Warnings removed for "assert_match /" Please do
not add more.!
009a0f8
@arunagw arunagw Modified content in guides and comments
for "assert /" warnings.
Removed because if somebody will use this code 
they will get warnings!
9859928
@arunagw arunagw stop circular require warnings f397ced
@spastorino spastorino Merge pull request #2843 from arunagw/warnings_removed_for_test_3-1-s…
…table

Warnings removed for test 3 1 stable
4fa403c
@spastorino spastorino Remove useless parens 04c25a7
@arunagw arunagw require bcrypt to pass the test 8be13b5
@jonleighton jonleighton Merge pull request #2846 from arunagw/bcrypt_3-1-stable
Bcrypt 3 1 stable
000fee7
@arunagw arunagw 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
@jonleighton jonleighton Merge pull request #2849 from arunagw/jruby_activesupport_fix_3-1-stable
Jruby activesupport fix 3 1 stable for JRuby
df3360f
@vijaydev vijaydev add some missing dots in the docs c0b73b5
@vijaydev vijaydev minor fixes in assets guide 9ef943c
@arunagw arunagw We need to recorder here. Need to drop the order from default scope.
Fixes #2832
e8761b3
@jonleighton jonleighton Merge pull request #2850 from arunagw/find_in_batch_fix
Find in batch fix
6be4deb
@arunagw arunagw Changelog updated for find_in_batches fix. c0f73be
@jonleighton jonleighton Merge pull request #2854 from arunagw/find_in_batches_changelog
Find in batches changelog
6abb8c9
@spastorino spastorino * is not allowed in windows file names. Closes #2574 #2847 ba13004
@spastorino spastorino Merge pull request #2860 from guilleiguaran/fix-assets-behavior
Fix AssetNotPrecompiledError behavior
3250c7f
Commits on Sep 05, 2011
@spastorino spastorino Merge pull request #2861 from guilleiguaran/assets-fix-changelog
Add entry about Asset behaviour fix to ActionPack ChangeLog
1458ada
@arunagw arunagw Sort here to make sure the order is ok. 1b1bd6c
@jonleighton jonleighton Merge pull request #2867 from arunagw/batches_test_pg_3-1-stable
Need to make sure about order here.
0b7a1f8
@spastorino spastorino Merge pull request #2799 from tomstuart/3-1-stable
Never return stored content from content_for when a block is given
a2baf03
@dmathieu dmathieu Backport #2789 and add changelog entry 327fa94
@spastorino spastorino Merge pull request #2873 from guilleiguaran/remove-unused-config
Remove unused config variable from test.rb template
4b39d4d
@jonleighton jonleighton Merge pull request #2871 from dmathieu/limit-3-1-stable
Backport #2789 to 3-1-stable
76d3b47
@sikachu sikachu 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
@spastorino spastorino Merge pull request #2874 from sikachu/3-1-stable-extractable_ordered_…
…hash

Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options!`
a7f5532
@georg georg Don't find belongs_to target when the foreign_key is NULL. Fixes #2828 78c896c
@tenderlove tenderlove Merge pull request #2716 from jbbarth/fix_invert_rename_index
Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index
c33b7c4
@spastorino spastorino Merge pull request #2877 from dmathieu/fix_tests_pg_18
Last orders the records by id
d194397
@spastorino spastorino Merge pull request #2870 from arunagw/uglifier_bump
Uglifier bump
10f2c01
@spastorino spastorino Bump uglifier up b949fde
Commits on Sep 06, 2011
@jonleighton jonleighton Add CHANGELOG entry for 78c896c 431d766
@dmathieu dmathieu #first doesn't take an order in this test 679a4eb
@jonleighton jonleighton 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
@jonleighton jonleighton 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
@jonleighton jonleighton 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
@jonleighton jonleighton 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
@spastorino spastorino Merge pull request #2889 from guilleiguaran/perform-caching-assets
config.action_controller.perform_caching isn't used anymore in asset pipeline
a22701e
@spastorino spastorino Merge pull request #2577 from rails-noob/master
Fix double slash at start of paths when mounting an engine at the root.
699b83a
@rsutphin rsutphin Completely remove the pool when removing a connection. Fixes #2820. c5af3a6
@tenderlove tenderlove adding a statement pool for mysql and sqlite3 b37112f
Commits on Sep 07, 2011
@tenderlove tenderlove 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
@tenderlove tenderlove updating changelog with pool limit de03d4f
@tenderlove tenderlove Eliminate newlines in basic auth. fixes #2882 9959233
@tenderlove tenderlove updating changelog 4263a79
@tenderlove tenderlove Merge pull request #2897 from rsutphin/ar31-remove_connection
Patch for issue #2820
9198c7a
@holodigm holodigm Postgresql adapter: added current_schema check for table_exists? 81a19c4
@holodigm holodigm Postgresql adapter: added current_schema check for table_exists? 6a14b01
@jonleighton jonleighton Don't include any of includes, preload, joins, eager_load in the thro…
…ugh association scope.
df21e3d
@spastorino spastorino Merge pull request #2904 from guilleiguaran/refactor-assets-tests
Refactor assets tests to use add_to_config
759f3e5
@toolmantim toolmantim 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
@tenderlove tenderlove Merge pull request #2913 from toolmantim/3-1-stable
Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already present
4a2e619
@tenderlove tenderlove 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
@tenderlove tenderlove use the supplied bind values 76993f6
@akaspick akaspick fix exists? to return false if passed nil (which may come from a miss…
…ing URL param)
44a5849
@akaspick akaspick entry for fixing exists? 8f2f39b
@spastorino spastorino Merge pull request #2921 from akaspick/exists_fix_3_1
fix exists? to return false if passed nil (backport to 3-1-stable)
6a18262
@akaspick akaspick 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
@akaspick akaspick assert_select_email fix entry 954543e
@jonleighton jonleighton Merge pull request #2926 from akaspick/assert_select_email_fix_3_1
assert_select_email fix for 3-1-stable
866303d
@tenderlove tenderlove LRU should cache per process in postgresql. fixes #1339 77e0bdd
@tenderlove tenderlove fixing file name 24b3783
@tenderlove tenderlove LRU cache in mysql and sqlite are now per-process caches. b92a025
Commits on Sep 08, 2011
@guilleiguaran guilleiguaran Add JavaScript and ERB section to Asset Guide 2451a68
@guilleiguaran guilleiguaran Add CoffeeScript example to JavaScript and ERB section abb0af1
@guilleiguaran guilleiguaran Add reference about "bundle install --without assets" in Precompiling…
… Assets section.
8461804
@ugisozols ugisozols Change hyphen to underscore. 7e587c2
@milgner milgner Fixed Apache configuration for gzipped assets: FilesMatch and Locatio…
…nMatch cannot be nested.
ac60460
Ryan Walker Added note about adding a javascript runtime to Gemfile for productio…
…n environment.
fa6bfce
@vijaydev vijaydev copy edit assets guide 5ed3e6a
@joelmoss joelmoss db:migrate:status correctly uses ActiveRecord::Migrator.migrations_pa…
…ths instead of only the apps db/migrate directory, which will include engine migrations.
dffd058
@jonleighton jonleighton 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
Commits on Sep 10, 2011
@spastorino spastorino Merge pull request #2876 from alex3/patch-1
Fixed assets precompile regex
082f53a
@spastorino spastorino Merge pull request #2957 from waseem/migration_status_tests
Tests for rake db:migrate:status.
7317f6c
@arunagw arunagw Adding assert for "test_form_for_with_isolated_namespaced_model" 38c7a67
@arunagw arunagw Warnings removed unused variables. Please don't add them 1ca38c6
@spastorino spastorino Merge pull request #2967 from arunagw/add_missing_assert
Add missing assert
f8c4519
@spastorino spastorino Merge pull request #2970 from deepakprasanna/master
Added a case to check the status of the migration after a rollback and redo.
c0775c6
@fxn fxn clarify that documentation bugs have to be reported as Rails issues. …
…[Closes #2858]
a7998dc
Commits on Sep 11, 2011
@dharmatech dharmatech getting_started.textile section 6: Correct file names in table fbcff81
@vijaydev vijaydev some copy-edits 06ed248
@michaelplaing michaelplaing Update to conform to rails 3.1 generated caode 04767d1
@alindeman alindeman Fix for :instance_reader => false code example b9c66fa
@hasanove hasanove Fix typo in "must-revalidate" header name df761ba
@spastorino spastorino Merge pull request #2969 from arunagw/warnings_removed_3_1_stable
Warnings removed 3 1 stable
96d63e1
Commits on Sep 12, 2011
@spastorino spastorino Merge pull request #2936 from joelmoss/migration_status
db:migrate:status not looking at all migration paths
90cd024
@kaiwren kaiwren Issue #636 - Parsing an xml file with multiple records and extra attr…
…ibutes (besides type) fails
981f076
@josevalim josevalim Merge pull request #2983 from sikachu/3-1-stable-hash-backported
Issue #636 - Parsing an xml file with multiple records and extra attribut
112c730
@josevalim josevalim Revert "Copy the bin to railties so it also works if you don't have t…
…he rails gem."

This reverts commit 20db687.
91f549b
@josevalim josevalim Remove rails executable from the gemspec. a299105
@jmileham jmileham ActiveResource shouldn't rely on the presence of Content-Length 184d8a2
@spastorino spastorino Merge pull request #2985 from kennyj/master
fix #2582 (with testcase)
7e26ab1
@spastorino spastorino Merge pull request #2988 from guilleiguaran/remove-extra-line
Remove odd asignation
79509a2
Commits on Sep 13, 2011
@spastorino spastorino Merge pull request #2987 from kennyj/master 8c3f6f6
@spastorino spastorino Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets c289dea
@spastorino spastorino always rewrite_relative_url_root f79fac5
@guilleiguaran guilleiguaran Backport e767cda (move assets tests to assets_test file) 3d042fa
@spastorino spastorino 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
@spastorino spastorino Merge pull request #3000 from guilleiguaran/fix-relative-url-root
Fix for relative url root in assets
bb93687
@spastorino spastorino Merge pull request #3001 from guilleiguaran/fix-assets-precompile-hos…
…t-test

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

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

Clear cache before of each precompile to avoid inconsistencies. Fixes #3014
499ea51
@jaimeiniesta jaimeiniesta Fix typos and broken link on asset pipeline guide e20d761
@bwalding bwalding Add equivalent nginx configuration 9a2fa21
@spastorino spastorino Allow asset tag helper methods to accept :digest => false option in o…
…rder to completely avoid the digest generation.
64de4dd
@spastorino spastorino Add some CHANGELOG missing stuff ae6c555
@spastorino spastorino Bumping up to 3.1.1.rc1 3f9665b
Commits on Sep 15, 2011
@htanata htanata Fix: habtm doesn't respect select query method.
Patch for issue #2923.
8dd3968
@dmathieu dmathieu cherry-pick #1318 into 3-1-stable 5b20d4c
@jonleighton jonleighton Merge pull request #3036 from dmathieu/cherry-pick-1318
Cherry pick 1318
06b5182
Commits on Sep 16, 2011
@josevalim josevalim 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
Commits on Sep 17, 2011
@spastorino spastorino Proper lines numbers for stack trace info 12a7dc4
@milgner milgner 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
@pixeltrix pixeltrix Revert "Fixed Apache configuration for gzipped assets: FilesMatch and…
… LocationMatch cannot be nested."

This reverts commit 99f59f9.
12d4514
@arunagw arunagw Bump AR-JDBC version.
THis version is compatible with 3.1 and above
4d2089c
Commits on Sep 18, 2011
@spastorino spastorino Merge pull request #3056 from arunagw/arjdbc_bump
Arjdbc bump
df97bf5
@spastorino spastorino 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
@arunagw arunagw fixed test for JRuby.
for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION
2d4ac4f
Commits on Sep 19, 2011
@spastorino spastorino Merge pull request #3060 from arunagw/query_cache_test_3-1-stable
Query cache test 3 1 stable
af46454
Commits on Sep 21, 2011
@spastorino spastorino Merge pull request #3065 from brainopia/fix_to_param_test
Fix test to reflect use of to_param for keys
4e37995
@avakhov avakhov update guides, use html safe translations in i18n bcbc484
@guilleiguaran guilleiguaran Add reference about --skip-sprockets to Asset Pipeline Guide ce758e2
@kirs kirs "Passing variables into the translation" section added 6867150
@vijaydev vijaydev minor edit e3b1d9a
@vijaydev vijaydev Fixing incorrect notextile tags cde34fb
@ugisozols ugisozols sass-rails helpers - hyphenated in Sass, underscored in Ruby. a8501c1
@radar radar Document ActiveRecord::QueryMethods#select c7ed6f3
@jnv jnv Locale code for Czech is ":cs" 5deb664
@vijaydev vijaydev remove unnecessary markup f289404
@vijaydev vijaydev copy edits 908f261 caf42a8
@vijaydev vijaydev copy edits 302e570 03d3063
@spastorino spastorino Add jquery-rails to Gemfile of plugins, test/dummy app uses it.
Closes #3091
ed96ee5
Commits on Sep 22, 2011
@spastorino spastorino Merge pull request #3081 from guilleiguaran/move-precompile-to-class
Move precompiling from task to Sprockets::StaticCompiler
40a574f
@spastorino spastorino Merge pull request #3027 from alex3/assets-precompile-regex-fix
Default precompile regex was erroneously matching files
49584b2
Pawel Pierzchala Fix named routes modifying arguments
Signed-off-by: José Valim <jose.valim@gmail.com>
d879213
@spastorino spastorino Merge pull request #3096 from phuibonhoa/master
FileStore key_file_path does not properly limit filenames to 255 characters
52edadf
@spastorino spastorino No need to create a range object 1b780cc
@hone hone AR wants sqlite3 1.3.4 16b8fde
@josevalim josevalim Merge pull request #3102 from hone/3-1-stable
Bump sqlite3 in Gemfile to 1.3.4
710a284
@hone hone set env to let rails know we're precompiling d123489
@josevalim josevalim Merge pull request #3103 from hone/precompile_flag
set env to let rails and co. (read gems) know we're precompiling
9eb628a
Commits on Sep 23, 2011
@spastorino spastorino Merge pull request #3092 from asee/master
Sprockets to use config.assets.prefix, with tests
d4f999f
@spastorino spastorino Merge pull request #3115 from guilleiguaran/refactor-rails-helpers
Remove Sprockets compute_public_path, AV compute_plubic_path can be used
f64a352
Commits on Sep 24, 2011
@josevalim josevalim `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
@josevalim josevalim Remove the ENV flag, yagni. 2a68867
@josevalim josevalim Add test for belongs_to? and group initializers. 0a4b8fb
@josevalim josevalim Avoid using pathnames and automatically create the manifest directory…
… if one does not exist yet.
253c0bc
@josevalim josevalim Fix spacing on Gemfile. 7f8f1f3
@cablegram 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
@spastorino spastorino Revert "Make process reuse the env var passed as argument"
This reverts commit 0e4748c.
3200cd0
@spastorino spastorino 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
@spastorino spastorino Merge pull request #3123 from avakhov/patch-5-remove-superfluous-to-s
remove superfluous to_s in ERB::Util.html_escape
42c2b24
Commits on Sep 25, 2011
@avakhov avakhov escape options for the stylesheet_link_tag method
Signed-off-by: José Valim <jose.valim@gmail.com>
a61d85c
Commits on Sep 26, 2011
@jonleighton jonleighton 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
@vijaydev vijaydev remove stray line 7d603ff
@jonleighton jonleighton Add deprecation for the preload_associations method. Fixes #3022. 6c5295f
@spastorino spastorino image_tag should use /assets if asset pipelining is turned on. Closes #… 0cb84f1
@josevalim josevalim Encapsulate assets initialization in its own rake task. ef7de0c
@jonleighton jonleighton Fix belongs_to polymorphic with custom primary key on target.
Closes #3104.
4aeb7f2
@jonleighton jonleighton Forgot CHANGELOG entry. d25bee4
@spastorino spastorino 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
@spastorino spastorino Just assert_equal here ceb56f3
@jonleighton jonleighton Merge pull request #3030 from htanata/fix_habtm_select_query_method
Fix: habtm doesn't respect select query method
5767609
@jonleighton jonleighton Add CHANGELOG ecf5584
@guilleiguaran guilleiguaran Avoid use of existing precompiled assets during rake assets:precompil…
…e run. Closes #3119
b605bd5
@spastorino spastorino Copy assets to nondigested filenames too 6ba472c
@spastorino spastorino Merge pull request #3136 from guilleiguaran/clear-digests-on-precompile
Avoid use of existing precompiled assets during rake assets:precompile run
b703cdb
@spastorino spastorino Merge pull request #3138 from christos/correct_image_path_with_pipeline
Correctly override image_path in sprockets rails_helper
493077c
@jonleighton jonleighton Don't require a DB connection when setting primary key.
Closes #2807.
75e97a4
Commits on Sep 27, 2011
@fxn fxn partial pass over the asset pipeline guide 9f080e4
@avakhov avakhov fix ActionMailer readme example ef0f6ce
@avakhov avakhov update ActionMailer example using last truncate helper method signature e9de9e2
@nhocki nhocki 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
@plentz plentz fixing docs for delete_sql where quotes should be used in this example. 0cebbf4
@fxn fxn partial pass over the asset pipeline 7ebae12
@fxn fxn the infamous detail only spotted in GitHub diffs no matter how carefu…
…l you were before pushing
76cd9c0
Commits on Sep 28, 2011
@spastorino spastorino Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require
add missing require to html sanitizer
d6c333c
@vijaydev vijaydev fixing typo in assets guide d76b79b
45north Fixed markup error. 8df638d
@fxn fxn partial pass over the assets guide 05f0c41
@spastorino spastorino Merge pull request #3156 from ihower/enhance_button_to_helper_v2
Make button_to helper support "form" option
00f0fb8
@spastorino spastorino javascript_path and stylesheet_path should honor the asset pipelining 7e2de38
Commits on Sep 29, 2011
@spastorino spastorino Fix tests in 1.8.7 85f8458
@jonleighton jonleighton Don't call self.class unless necessary. Closes #3171. 45c56bd
@spastorino spastorino Add CHANGELOG entries 8aee03b
@spastorino spastorino Bumping to 3.1.1.rc2 aead572
Commits on Oct 01, 2011
@arunagw arunagw Warning Use of :: in void context Warning removed 32df5b6
@josevalim josevalim Merge pull request #3186 from arunagw/void_context_warnings_removed_3…
…-1-stable

Void context warnings removed 3 1 stable
581173d
Commits on Oct 02, 2011
@phuibonhoa phuibonhoa Added fix so that file store does not raise an exception when cache d…
…ir does not exist yet. This can happen if a delete_matched is called before anything is saved in the cache.

Signed-off-by: José Valim <jose.valim@gmail.com>
5986d9b
@phuibonhoa phuibonhoa Improved testing so that it tests the real functionality and not the …
…private method.

Signed-off-by: José Valim <jose.valim@gmail.com>
ef9cf3d
@josevalim josevalim TestCase should respect the view_assigns API instead of pulling varia…
…bles on its own.
f63b1de
@josevalim josevalim Provide initialize_on_precompile which, when set to false, does not i…
…nitialize the app for precompilation. Defaults to true.
258fe7d
@spastorino spastorino capture was commented out e6156cb
@spastorino spastorino Precompile properly refers files referenced with asset_path test d2219c5
@fxn fxn documents config.assets.initialize_on_precompile in the asset pipelin…
…e guide
27ec2d3
@fxn fxn rewords the docs of config.assets.initialize_on_precompile in the ass…
…et pipeline guide
d94aa10
@josevalim josevalim :group => :assets should only run in the assets environment. ee8a37c
@josevalim josevalim Update sass and coffee dependencies to latest. 41cbd15
Commits on Oct 03, 2011
@spohlenz spohlenz Replace calls to capture(:stdout) with quietly in assets tests 29c2fc3
@spohlenz spohlenz Ensure that enhancements to assets:precompile task are only run once a6614c5
@josevalim josevalim Merge pull request #3192 from spohlenz/precompile-enhancement-fix
Fix regression in assets:precompile task when task is enhanced
7e03ace
@mjtko mjtko add failing test for #3198
Signed-off-by: José Valim <jose.valim@gmail.com>
6b1e4a2
@josevalim josevalim Fix #3198. 2db49c5
@jeremy jeremy Merge pull request #2801 from jeremyevans/patch-1
Fix obviously breakage of Time.=== for Time subclasses
5a9e79b
@abscondment abscondment Test demonstrating #3053: If-Modified-Since gets swallowed up by rack…
…-cache.

Signed-off-by: José Valim <jose.valim@gmail.com>
9533ff0
@abscondment abscondment Require rack-cache 1.1.
Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified headers when
config.action_controller.perform_caching is true. This has two problems:
 * unexpected inconsistent behaviour between development & production environments
 * breaks applications that use of these headers

Signed-off-by: José Valim <jose.valim@gmail.com>
3530afa
Commits on Oct 04, 2011
@Empact Empact Changing rake db:schema:dump to run :environment as well as :load_con…
…fig, as running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter.


This reverses a change made here: 5df72a2#L0L324

I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do".
e41bd38
@josevalim josevalim Merge pull request #3208 from Empact/patch-1
Change rake db:schema:dump to load schema dumper extensions such as those used by foreigner and spatial_adapter
9d34991
@josevalim josevalim Fix failing tests and refactor assets.rake 360b8c4
@spastorino spastorino Bump sprockets to 2.0.2 8bf761f
@mjtko mjtko add failing test: "digested assets are removed from configured path" 8093e38
@mjtko mjtko correct path used in "digested assets are not mistakenly removed" test a5eca91
@josevalim josevalim Merge pull request #3221 from mjtko/asset-tests
Failing test for assets:clean task issue
306123b
@josevalim josevalim Fix failing test added in previous commit. 4bc6e2f
@mjtko mjtko assets compilation task refactoring 63bab28
@mjtko mjtko don't munge the environment, let rake do that for us bbdb7f3
@mjtko mjtko only execute the nondigest task if needed 20173e2
@mjtko mjtko only reinvoke if necessary 45cdb3e
@mjtko mjtko added comment about why nondigest assets requires a reinvocation 871cbae
@josevalim josevalim Merge pull request #3225 from mjtko/assets-compilation-refactoring-th…
…e-sequel

assets rake task refactoring work - the sequel
0ad5040
@josevalim josevalim Encapsulate common rake invocation logic in a method. 188d21c
Commits on Oct 05, 2011
@josevalim josevalim Ensure default_asset_host_protocol is respected, closes #2980. db8db4a
@josevalim josevalim Fix the lame config.action_controller.present? check scattered throug…
…hout assets_path.
d9d1bb2
@josevalim josevalim Fix regression when calling helpers inside sprockets. c6d13b6
@amatsuda amatsuda override unsafe methods only if defined on String 9257a21
@amatsuda amatsuda ruby193: String#prepend is also unsafe aa11f73
@josevalim josevalim Merge pull request #3230 from amatsuda/string_prepend_31
ruby193: String#prepend for 3-1-stable
fc9b521
@ugisozols ugisozols Class name specified in example is Person, not AttributePerson. 14e2fe2
@avakhov avakhov missed underscore in AV::TestCase helper_method documentation cf4d166
@spastorino spastorino stylesheet_link_tag('/stylesheets/application') and similar helpers d…
…oesn't throw Sprockets::FileOutsidePaths exception anymore
4f2c238
@jonleighton jonleighton Raise an exception on unknown primary key inside AssociationReflection.
An association between two models cannot be made if a relevant key is
unknown, so fail fast rather than generating invalid SQL. Fixes #3207.
f8beca0
@josevalim josevalim Revert "don't raise NoMethodError the tried method doesn't exists"
This reverts commit 29a5aea.
3c6cbad
@spastorino spastorino Add missing CHANGELOG entried 162e13d
Commits on Oct 06, 2011
@spastorino spastorino Bumping to 3.1.1.rc3 57a01f3