Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Aug 22, 2011
@spastorino spastorino Merge pull request #2411 from ai/debug_assets_by_config
Debug assets by config
b938b04
Commits on Aug 23, 2011
@pixeltrix pixeltrix Don't modify params in place - fixes #2624
(cherry picked from commit 14cf4b2)
2af37b0
@pixeltrix pixeltrix Add failing test case for #2654
(cherry picked from commit ebea387)
586b284
@dmajda dmajda Make ActionController::TestCase#recycle! set @protocol to nil
This ensures that the protocol does not get carried over when there are
two or more requests in functional tests. This was a problem when e.g.
the first request was HTTP and the second request was HTTPS.

Closes #2654.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
(cherry picked from commit 68a13ed)
94a7803
@luckydev luckydev added missing require array/wrap in serialization e695538
@tilsammans tilsammans removed the link to my blog to help stop endless comments e3ba2cf
Commits on Aug 24, 2011
@spastorino spastorino Merge pull request #2647 from dmathieu/no_rescue
remove useless rescue
72802c6
@spastorino spastorino Merge pull request #2390 from arunagw/test_for_environment_file
Test added to check development.rb, test.rb and production.rb content
1fdae97
@spastorino spastorino Merge pull request #2668 from guilleiguaran/debug-assets-media-type
Debug assets shouldn't ignore media type for stylesheets. Closes #2625
d15e7aa
@spastorino spastorino Merge pull request #2644 from guilleiguaran/allow-assets-debugging
Add config.allow_debugging option
e65c2fe
@josh josh Merge branch '3-1-0' into 3-1-stable 64c1d8a
@tenderlove tenderlove dealing with some -w warnings on startup c29426d
@tenderlove tenderlove bumping bcrypt-ruby requirement 7286ecb
@tenderlove tenderlove require needs to return true or false. thank you Ryan "zenspider" Davis 7c5cd40
@tenderlove tenderlove `load` should also return the value from `super` 36d06d1
@spastorino spastorino Merge pull request #2677 from guilleiguaran/refactor-sprockets-helpers
Refactoring javascript_include_tag and stylesheet_link_tag Sprockets helpers
dc61b8f
@fxn fxn the command line guide is good to go 8184373
@tenderlove tenderlove we are *sure* we want to set the encoding, so silence warnings around it 3cbc1bd
@tenderlove tenderlove only define the encoding reader since we define the writer later on 95d35fc
@tenderlove tenderlove only backport the to_d method if it does not exist 23c5403
@tenderlove tenderlove fix ambiguous use of * 7e80394
@tenderlove tenderlove fix ambiguous * and remove unused variable 50db00d
Commits on Aug 25, 2011
@amatsuda amatsuda do not compute table names for abstract classes 933120c
@arunagw arunagw Yes we need this to pass the test. we are using config.log_level.
Fix broken test test_copying_migrations(RailtiesTest::EngineTest):
NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c>
dcb5f2b
@tenderlove tenderlove Merge pull request #2683 from arunagw/engine_test_fix
Engine test fix
9c33576
@spastorino spastorino Merge pull request #2696 from guilleiguaran/string-keys-sprockets-hel…
…pers

Removing redundant stringify_keys in Sprockets helpers
abab612
@tenderlove tenderlove Force binary data inserted for a string data type to utf-8 and log an
error.  Strings tagged as binary will be stored in sqlite3 as blobs.  It
is an error to insert binary data to a string column, so an error is
emitted in the log file.  People are highly encouraged to track down the
source of the binary strings and make sure that the encoding is set
correctly before inserting to the database.
20c0717
Commits on Aug 26, 2011
@guilleiguaran guilleiguaran Fix failing asset test under 1.8 aa99f8f
@spastorino spastorino Merge pull request #2701 from guilleiguaran/fix-asset-test-1.8
Fix failing asset test under 1.8
0353435
@tenderlove tenderlove stop messing with the load path, load path should be adjusted in the …
…test task
5145e98
Commits on Aug 27, 2011
@fxn fxn use sdoc to generate the API c563796
@fxn fxn deletes spurious arrow 8653ac3
Commits on Aug 28, 2011
@tenderlove tenderlove clear and disable query cache when an exception is raised from called…
… middleware
1130b72
@spastorino spastorino Bump rack-cache, rack-test, rack-mount and sprockets up 65d607f
@tenderlove tenderlove fixing typo 89f540c
@spastorino spastorino Merge pull request #2723 from guilleiguaran/3-1-0-changelogs
Update changelogs for Rails 3.1.0
97e0a77
Commits on Aug 29, 2011
@spastorino spastorino Merge pull request #2724 from guilleiguaran/avoid-recursive-call-spro…
…ckets-helper

Avoid extra recursive call in Sprockets helpers
ca26feb
@jonleighton jonleighton The join_nodes must be passed to the JoinDependency initializer and t…
…herefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556.
7abf441
@dmitriy-kiriyenko dmitriy-kiriyenko Fixed failing query when performing calculation with having based on …
…select.
d7618c7
@bogdan bogdan Fixed CollectionAssociation#find to be compatible with Array#find
In order to make CollectionAssociation behave closer to Array
Add the ability to pass block to #find method just like Array#find does.
132586e
@biow0lf biow0lf Documentation fixes 37df184
@fxn fxn let SDoc add a link to the source code in GitHub for each method cb25537
Commits on Aug 30, 2011
@guilleiguaran guilleiguaran Add a default asset version to production config, this give to the us…
…ers an idea about how to use it
b0f3063
@rsim rsim Oracle adapter removes double quotes when quoting table and column names db41b63
@jonleighton jonleighton Merge pull request #2750 from rsim/fix_test_column_names_are_escaped_…
…for_oracle

Fix test column names are escaped for oracle
c96788a
@rsim rsim Ensure correct ordering of results in test_update_all_with_joins_and_…
…offset_and_order

Last two asserts in this test assume that all_comments are ordered by posts.id and then by comments.id therefore additional ordering is added. Without it test was failing on Oracle which returned results in different order.
bef6ea1
@tenderlove tenderlove Merge branch '3-1-0' into 3-1-stable
* 3-1-0:
  Configuration changes for asset pipeline: remove config.assets.allow_debugging, add config.assets.compile and config.assets.digest
  Read digests of assets from manifest.yml if config.assets.manifest is on
  let SDoc add a link to the source code in GitHub for each method
  Documentation fixes
  bumping to 3.1.0.rc8
  bumping to 3.1.0.rc7
  Update Rails 3.1 CHANGELOGs
  Bump rack-cache, rack-test, rack-mount and sprockets up
  clear and disable query cache when an exception is raised from called middleware
  assert_no_match
  deletes spurious arrow
  use sdoc to generate the API
  Don't modify params in place - fixes #2624
  the command line guide is good to go
  `load` should also return the value from `super`
  require needs to return true or false. thank you Ryan "zenspider" Davis
  bumping bcrypt-ruby requirement
  Make ActionController::TestCase#recycle! set @protocol to nil
  Add failing test case for #2654

Conflicts:
	activerecord/test/cases/query_cache_test.rb
602a3c2
@tenderlove tenderlove Merge pull request #2748 from guilleiguaran/assets-version-config
Add config.assets.version to config/application.rb
eaea03b
@waynn waynn incorporate feedback from vijaydev and dasch to rephrase this to soun…
…d more natural, and some grammar fixes.
4869df1
@fxn fxn adds the asset pipeline guide to the index 5b2e79c
@fxn fxn Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable 714128f
@jonleighton jonleighton Merge pull request #2752 from rsim/fix_test_update_all_with_joins_and…
…_offset_and_order

Ensure correct ordering of results in test_update_all_with_joins_and_offset_and_order
3a8319e
@guilleiguaran guilleiguaran Set default location of manifest with config.assets.manifest ee3cc8f
@tenderlove tenderlove Merge pull request #2756 from guilleiguaran/manifest-location
Change manifest.yml location with config.assets.manifest
a244d11
@spastorino spastorino Revert "Merge pull request #2647 from dmathieu/no_rescue"
This reverts commit 125b1b0.
8bc6fc5
Commits on Aug 31, 2011
@spastorino spastorino Depend on sass-rails and coffee-rails 3.1.0 49c75a8
@spastorino spastorino Bump sprockets up 36352ca
@tenderlove tenderlove 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
@cgriego cgriego 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
@tenderlove tenderlove Merge pull request #2760 from cgriego/home_run
Fix ActiveSupport compatibility with home_run
403dc11
@tenderlove tenderlove adding changelog dates 5c5021f
@guilleiguaran guilleiguaran Update Assets guide to reflect all the new changes 1cda269
@fxn fxn adds the release notes of 3.1 to the index dc5957a
@fxn fxn release notes: adds a couple of blank lines to get the markup right 417c31c
@fxn fxn Merge pull request #2762 from guilleiguaran/assets-documentation
Assets Guide updates
271cf98
@raybaxter raybaxter don't need edgeapi now that we are on 3.1 57dd60f
@guilleiguaran guilleiguaran Always enable digest and compile in the Rake task 3f29342
@josevalim josevalim Merge pull request #2768 from guilleiguaran/fix-assets-rake-task
Always enable digest and compile in the Rake task
d6a0078
@tenderlove tenderlove 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
@dhh dhh Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore
Add .rbenv-version to .gitignore
15b75b4
@rhulse rhulse 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
@vijaydev vijaydev doc fixes d3d2cea
@kirs kirs Instructions for nginx and apache added 3fb0579
@fxn fxn 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
@guilleiguaran guilleiguaran Manifest should be nil by default. Closes #2776 a4b7363
@guilleiguaran guilleiguaran Remove deprecated code used only in Sprockets < 2.0.0.beta.15 e7a86b9
Commits on Sep 01, 2011
@spastorino spastorino Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-cha…
…nges

Assets pipeline: fix in manifest location and remove unused code
c2a323d
@guilleiguaran guilleiguaran Add missing changelog entries for 3.1.1 08f46b6
@spohlenz spohlenz Move references to Rails.application.config out of Sprockets AssetPaths 6bc6978
@josevalim josevalim Merge pull request #2784 from guilleiguaran/changelog-3-1-1
Add missing changelog entries for 3.1.1
6ba9aa7
@josevalim josevalim Merge pull request #2785 from spohlenz/extract-asset-paths-config
Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper
9bfaef0
@spohlenz spohlenz assets:precompile should not append asset digests when config.assets.…
…digest is false
a5619c0
@josevalim josevalim Merge pull request #2782 from spohlenz/precompile-without-digests
assets:precompile should not append asset digests when config.assets.digest is false
8b049a1
@tomstuart tomstuart Improve content_for test coverage b149021
@tomstuart tomstuart 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
@tenderlove tenderlove CookieJar is enumerable. fixes #2795 af7c9b9
@tenderlove tenderlove make sure encoding_aware? is available 3afa90d
@tenderlove tenderlove * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731
e46c4f1
@tenderlove tenderlove preserve the backtrace of the exception e6fd4ed
Commits on Sep 02, 2011
@jonleighton jonleighton Add missing CHANGELOG entry. Closes #2791. c0ae44c
@guilleiguaran guilleiguaran Remove hard dependency on bcrypt. 2b15762
@fxn fxn syncs asset pipeline guide with master e7ee2a9
Commits on Sep 03, 2011
@arunagw arunagw pg does not allow aliases in the having clause, but functions are fine e7eba93
@arunagw arunagw Warning removed. df01e2e
@vijaydev vijaydev Merge pull request #2830 from arunagw/warning_removed_3-1-stable
Warning removed 3 1 stable
e491444
@arunagw arunagw 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
@tenderlove tenderlove Merge pull request #2831 from arunagw/pg_abstract_class_fix
Fixed test for 3-1-stable. Abstract class is having nil class name.
e835aa0
@tenderlove tenderlove Merge pull request #2829 from arunagw/pg_min_fix
pg does not allow aliases in the having clause, but functions are fine
66754c4
@tenderlove tenderlove Merge pull request #2825 from guilleiguaran/bcrypt-ruby-comments
Add comments about bcrypt-ruby gem to SecurePassword and add it to default Gemfile
b7a62f2
@guilleiguaran guilleiguaran Add entry about bcrypt-ruby remove to ActiveModel changelog 0a6de72
@tenderlove tenderlove Merge pull request #2826 from guilleiguaran/changelog-remove-bcrypt
Changelog entry about remove of bcrypt as hard dependency on ActiveModel
459e62a
@guilleiguaran guilleiguaran Include ticket numbers in CHANGELOG d3b7c34
@rhulse rhulse Added new asset config options to guides ce5b559
@guilleiguaran guilleiguaran Review config.assets options. ba75385
@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