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
Commits on Dec 19, 2011
@nashby nashby add failing tests for issue #3487 024d3b9
Commits on Dec 20, 2011
@josevalim josevalim Remove i18n dependencies from AP and AMo since they are in AS. 5d91364
Xu Pan don't encode an UTF-8 encoded template
Signed-off-by: José Valim <jose.valim@gmail.com>
1897be9
@josevalim josevalim Do not hard code encoding to UTF8 2e0050c
@josevalim josevalim Check if source is encoding aware. 2305a98
@lest lest remove warnings about @variable_for_layout
Signed-off-by: José Valim <jose.valim@gmail.com>
e97aa2c
@josevalim josevalim Add a test case for layout nil. f29b4a0
@josevalim josevalim Depend on 3-2-stable. 51e8adb
@htanata htanata Improve doc for ActiveRecord::Base.unscoped. e149d50
@atambo atambo Fix reference to old :sql schema_format location
After 15fb430 the default location of the :sql schema_format location was
changed from environment_name.sql to structure.sql. This pull request updates
a reference to the old schema format location in the migration guides.
fec2999
@nashby nashby fix adding field_with_errors to date selects, closes #3487 9208813
@josevalim josevalim Merge pull request #4064 from nashby/date-helper-field-error-proc
fix adding field_with_errors to date selects, closes #3487
437f1e0
@arunagw arunagw It should be README.rdoc fixes #4067 490c00b
@spastorino spastorino Merge pull request #4069 from arunagw/issue_4067
It should be README.rdoc
cf2d31a
@heimidal heimidal Ensure option for select helper responds to `#first` before comparison. bd89946
@heimidal heimidal Check for response to `#last` instead of `#first`. a1b2dbd
@josevalim josevalim Merge pull request #4080 from heimidal/3-2-stable
Fix regression in select form helper when options are non-string values
a2f5df5
Commits on Dec 21, 2011
@htanata htanata Doc fixes on Rails::Generators::Base.hook_for. efb75f7
@jeremy jeremy Rails::SubTestTask warns on test failure and moves on. Renamed from T…
…estTaskWithoutDescription.

This makes it easier to add your own tests to the default suite:

  namespace :test do
    task run: 'test:acceptance'

    Rails::SubTestTask.new acceptance: 'test:prepare' do |t|
      t.libs << 'test'
      t.pattern = 'test/acceptance/**/*_test.rb'
    end
  end

Now `rake` runs unit, functional, integration, and acceptance tests.
e854848
@tenderlove tenderlove caches should not be global, so no need to clear in the teardown 79778ff
@tenderlove tenderlove adding integration test for journey #7 d5ccb5c
@jeremy jeremy Move SubTestTask. Soften up tests. 108e344
@qoobaa qoobaa added failing tests for has_many, has_one and belongs_to associations…
… with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051

Signed-off-by: José Valim <jose.valim@gmail.com>
2d07c60
@lucasmazza lucasmazza raises an ArgumentError if no valid options are given to TemplateRend…
…erer#determine_template

Signed-off-by: José Valim <jose.valim@gmail.com>
b5bb3f8
@tenderlove tenderlove append puts the routes after the default, which causes a 404. instead…
… use prepend
476dce4
@tenderlove tenderlove just require things once 1945baf
Commits on Dec 22, 2011
@arunagw arunagw [docs] added missing "}" fixes #4126 8dc8926
@drogus drogus Merge pull request #4128 from arunagw/doc_fixes_3_2-stable
Doc fixes 3 2 stable
278a72e
@tenderlove tenderlove Revert "Added Enumerable#pluck to wrap the common pattern of collect(…
…&:method) *DHH*"

This reverts commit 4d20de8.
c0563ce
@tenderlove tenderlove Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
* '3-2-stable' of github.com:rails/rails:
  [docs] added missing "}" fixes #4126
89e2647
@jonleighton jonleighton Make read_attribute code path accessible at the class level 7edade3
@jonleighton jonleighton Make ActiveRecord::Relation#pluck work with serialized attributes e46e491
@tenderlove tenderlove refactoring routing tests 585e291
@spastorino spastorino Use sass-rails >= 3.2.2 for new apps 6758941
@tenderlove tenderlove rack bodies should be a list 2bc3f81
@tenderlove tenderlove Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
* '3-2-stable' of github.com:rails/rails:
  Use sass-rails >= 3.2.2 for new apps
  Make ActiveRecord::Relation#pluck work with serialized attributes
  Make read_attribute code path accessible at the class level
f2e65b7
Commits on Dec 23, 2011
@tenderlove tenderlove Adding an integration test. Fixes #4136 a32d3d0
@tenderlove tenderlove adding an integration test for splat regexp substitutions. fixes #4138 5f2bfce
@jonleighton jonleighton Fix build when IM=true 96c38ec
@josevalim josevalim Merge pull request #4141 from arunagw/fix_build
Fix build 3-2-stable
35ded6f
@fxn fxn removes Enumerable#pluck from the AS guide 824334c
@alvarobp alvarobp serialize fails on subclass 6b9ab88
@jonleighton jonleighton Fix #4046. 7bb754e
@jonleighton jonleighton Doh, remove debugging line 9d9440f
@vijaydev vijaydev Rails 3.2 Release Notes 4a86708
@jonleighton jonleighton Fix situation where id method didn't get defined causing postgres to …
…fail
0a2e379
Commits on Dec 24, 2011
@jeremy jeremy Remove broken #compute_source_path 684448b
@ai ai Gzip files on page caching
Signed-off-by: José Valim <jose.valim@gmail.com>
754823d
@josevalim josevalim Provide a class optin for page_cache_compression. ba86892
@josevalim josevalim Remove unecessary config_accessors. c4ef3d3
@german german added ability to specify from cli when generating a model/migration w…
…hether particular property should be an index like this 'rails g model person name:string:index profile:string'
7f5b516
@josevalim josevalim Tidy up migration types. 557014d
@josevalim josevalim Update CHANGELOGs. fc42998
@josevalim josevalim Fix regexp intervals. 1db5f4e
@vijaydev vijaydev minor edits in caching guide 853439c
@vijaydev vijaydev add latest changes to 3.2 release notes 929bfb8
@josevalim josevalim assert_not_match -> assert_no_match. 0e8cbbe
@tenderlove tenderlove delegating and deprecating logger#silence. fixes #4159 b590fe4
@tenderlove tenderlove avoid deprecation warnings when running AR tests a410a9c
@josevalim josevalim Last attempt to fix 1.8.7 tests. bea3524
Commits on Dec 25, 2011
@fxn fxn (draft) guides for the Kindle and Kindle apps [Mip Earson & Xavier No…
…ria]
69cc645
@kuroda kuroda Reconnect to the first database after db:create
Otherwise, the schema and seed will be loaded onto the
test database.
38bc917
@tenderlove tenderlove Merge pull request #4175 from kuroda/3-2-stable
Reconnect to the first database after db:create
0daf80a
@fxn fxn guides generation for the Kindle looking good now [Mip Earson & Xavie…
…r Noria]
4ae1cdd
@fxn fxn download guides for the Kindle and Kindle apps from the home page d6d561e
@fxn fxn registers guide generation for the Kindle and Kindle apps in the Chan…
…gelog
7ec8473
@mipearson mipearson Mip Earson -> Michael Pearson in changelog. 51fd3f3
@vijaydev vijaydev fix kindle apps link in edge guides index 7a3121b
@vijaydev vijaydev Some fixes in rails guides generation
* Passing edge information to the views fixes the lack of the edge badge
and sets the appropriate welcome page on edgeguides.rubyonrails.org.
* Changes in the welcome message to hyper link the rails tree based on
the version.
* Mention the Amazon url from where kindlegen can be downloaded.
68564eb
@vijaydev vijaydev add back the version info to the title in guides index page 4cf40d0
Commits on Dec 26, 2011
@drogus drogus Correctly display rack apps with dynamic constraints in RoutesInspector
If you used dynamic constraint like that:

  scope :constraint => MyConstraint.new do
    mount RackApp => "/foo"
  end

routes were not displayed correctly when using `rake routes`.
This commit fixes it. If you want nice display of dynamic
constraints in `rake routes` output, please just override
to_s method in your constraint's class.
d7cfb63
Commits on Dec 27, 2011
@gazay gazay Safe getting value from cache entry f7b1906
@tapajos tapajos Closes #4208 b3490d8
Commits on Dec 28, 2011
@josevalim josevalim Merge pull request #4210 from tapajos/patch-1
Fix #4208
d547761
@tapajos tapajos Remove empty line. 7767159
@fxn fxn Merge pull request #4217 from tapajos/patch-2
Remove empty line
40cab62
@bensie bensie Further simplify singleton_class checking in class_attribute 520918a
@spastorino spastorino Bump to rack 1.4.0 2004a13
@spastorino spastorino Add CHANGELOG entry a0fd9fb
@tenderlove tenderlove Merge pull request #4196 from gazay/3-2-stable-marshalling
3.2 stable marshalling
df37018
@jonleighton jonleighton Revert "Further simplify singleton_class checking in class_attribute"
This reverts commit 520918a.

Reason: build failure
bbafe73
@fxn fxn app code in general wants Time.current, not Time.now 7a80ac0
Commits on Dec 29, 2011
@tenderlove tenderlove last named route wins. fixes #4164
This differs from route recognition where first recognized route wins.
This will not be supported in Rails 4.0 so that route recognition and
generation rules are consistent.
50af25b
@tenderlove tenderlove Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling"
This reverts commit df37018, reversing
changes made to a0fd9fb.
80f2eeb
@tenderlove tenderlove Merge pull request #4216 from edgecase/master_fix_reorder_with_limite…
…d_ids

allow reorder to affect eager loading correctly
f423bdc
@gazay gazay Backward compatibility with 3.1 cache storing b815676
@ugisozols ugisozols Remove unnecessary comma. bea4f9a
@joliss joliss Document that index names are made up of all columns, not just the fi…
…rst.

index_name has been using the following expression

    "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}"

since at least 2006 (bc7f231), and that's how they come out in my DB.

Please check that this is correct before merging into master, perhaps
I'm misunderstanding the section I changed.
d8a43e2
@fuzzyalej fuzzyalej Fixed formatting of code examples in form_tag_helper.rb 5f57d2a
@kevmoo kevmoo Documented about using :path option for resources 2e533e3
@vijaydev vijaydev revise some doc changes 63c6fee
@tenderlove tenderlove fixing typo. Thanks Vijay! 766eda3
Commits on Dec 30, 2011
@lest lest refactor Range#include? to handle ranges with floats
Conflicts:

	activesupport/lib/active_support/core_ext/range/include_range.rb
71f59b7
@fxn fxn adds a comments that clarifies why Range#include? chooses the compari…
…son operator
0814e74
@tenderlove tenderlove Merge pull request #4227 from gazay/3-2-stable-marshalling
3 2 stable marshalling
f12d904
Commits on Dec 31, 2011
@vijaydev vijaydev remove wiki link 0a048f3
@vijaydev vijaydev fix a couple of formatting issues ba19837
@sumbach sumbach Minor readability improvements 003d0ff
@sumbach sumbach SCSS processor is provided by the sass gem 95a83cc
@fuzzyalej fuzzyalej Fixed documentation error in code examples from form_tag_helper.rb 8be9d92
Commits on Jan 01, 2012
@vijaydev vijaydev DRY up guides index page
Use the list of guides available in documents.yaml to fill in the
menu in the index page instead of duplicating the list again. Also,
remove WIP guides from the menu.
6e9cd38
Commits on Jan 02, 2012
@lest lest deprecate ActiveSupport::Base64
extend and define ::Base64 if needed
5f09414
@fxn fxn Merge pull request #4267 from lest/3-2-deprecate-activesupport-base64
deprecate ActiveSupport::Base64
7bdfbac
@lest lest fix base64 requires 4f440a3
@fxn fxn Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64
fix base64 requires
e369c4e
Commits on Jan 03, 2012
@lest lest use pg 0.11.0 under ruby 1.8.7 0b5cda7
@josevalim josevalim Merge pull request #4273 from lest/fix-pg-version
use pg 0.11.0 under ruby 1.8.7
2535898
@spastorino spastorino Deprecate Rails::Plugin in favor of gems 853de2b
@lest lest deprecate AS::Base64 methods without DeprecatedConstantProxy 1fc53df
@josevalim josevalim Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64
deprecate AS::Base64 methods without DeprecatedConstantProxy
c032ff6
@spastorino spastorino Merge pull request #4278 from kennyj/fix_rdoc_generating_problem
Use -e option instead of -c option (rake rdoc task).
ca24ee7
@tenderlove tenderlove Merge pull request #4279 from lest/fix-log
do not rewrite log during application bootstrap
eafdf6c
@spastorino spastorino Add font_path helper method 0d7d3a6
@bogdan bogdan AS::Callbacks: improve __define_runner perfomance 9f8f4c2
@bogdan bogdan AS::Callbacks: improved __define_runner performance 4e8286f
@bogdan bogdan Refactor AS::Callbacks
Extracted `__reset_runner` from `__define_runner`
And call it in proper places
5b8d270
@bogdan bogdan AS::Callbacks: remove __define_runner 40c8aa7
@josevalim josevalim Override respond_to? since we are also overriding method_missing. d38dac8
@josevalim josevalim Merge pull request #4280 from lest/3-2-backport-callbacks
backport changes in AS::Callbacks
124536e
@spastorino spastorino Pass extensions to javascript_path and stylesheet_path helpers. Closes 8c129f1
@lest lest add CHANGELOG entry for AS::Base64 deprecation 337ac05
@spastorino spastorino Merge pull request #4281 from lest/3-2-changelog
add CHANGELOG entry for AS::Base64 deprecation
caa6cde
@tenderlove tenderlove Merge pull request #4283 from lest/fix-singleton-checking
use correct variant of checking whether class is a singleton
c4a29de
@tenderlove tenderlove Revert "Named Routes shouldn't override existing ones (currently rout…
…e recognition goes with the earliest match, named routes use the latest match)"

This reverts commit 71d769e.
e912211
@tenderlove tenderlove When generating routes, the last defined named route wins. This is in
contrast to route recognition where the first recognized route wins.
This behavior will not exist in Rails 4.0.

See:

  #4245
  #4164
63f7a61
Commits on Jan 04, 2012
@kennyj kennyj Fix GH #4285. Remove options when we record calling creat_table 6012970
@josevalim josevalim Merge pull request #4288 from kennyj/fix_4285-2
(3-2-stable) Fix GH #4285. Remove options when we record calling create_table
a10f309
@imkmf imkmf Final grammar checkup on 3.2 release notes. 6bcc1b8
@vijaydev vijaydev updates to 3.2 release notes bc36613
@ffmike ffmike General editing pass over assets pipeline guide 20a4258
@elpic elpic improve doc in number helper options 00a27c5
@vijaydev vijaydev copy edits 4b2b595
@spastorino spastorino Revert "use pg 0.11.0 under ruby 1.8.7"
There's a new pg release, no need for this anymore
This reverts commit 0b5cda7.
3fb32cf
@spastorino spastorino Use sass-rails 3.2.3 f8df37b
@tenderlove tenderlove Merge pull request #4282 from edgecase/order_after_reorder
correctly handle order calls after a reorder
d22592a
@jeremy jeremy Clarify vendor/plugins deprecation warning d9e0c4a
@jeremy jeremy Add release notes URL to vendor/plugins deprecation warning. Update C…
…HANGELOG.
49a1017
@josevalim josevalim Revert "AS::Callbacks: remove __define_runner"
Runners are used internally.

This reverts commit 40c8aa7.
0b24dc9
@spastorino spastorino Bump to rc2 d268ef2