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
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Nov 27, 2010
@radar radar There is no config.action_mailer.default_implicit_parts_order method …
…for Rails 3
29a2e61
@radar radar There is no RAILS_GEM_VERSION environment variable or constant for Ra…
…ils 3, since this is now managed by Bundler
7a334b3
@radar radar Update Changelog for configuring guide 5b5d3e5
@radar radar root_path is now simply root in Rails 3 78d782f
@radar radar There is no more load_application_initializers in Rails 3 fb661f3
@radar radar Add mention of after_initialize to the config guide a571d4b
@radar radar Added documentation for config.generators to the config guide 550ac57
@asanghi asanghi Resolving LH #5986, cookies doc updates abe28bf
@andmej andmej Added missing word. ab42529
@andmej andmej Mentioning catch with Bundler remembering options between different c…
…alls
a82c272
@radar radar Add mention of config.serve_static_assets to config guide 9c6afa7
@radar radar Add explicit statement that verify_authenticity_token can be turned o…
…ff for actions.
2c4bab6
@radar radar Add "Configuring Middleware" section to config guide, starting with m…
…entioning what every bit of middleware does.
62164e0
@radar radar Add methods for configuring middleware to config guide 2d8c104
@mikel mikel Application templates should work with HTTPS too eb27d80
Commits on Nov 28, 2010
@spastorino spastorino Fix test 2f09a5a
@spastorino spastorino Fix another error in tests 5c21c1c
@spastorino spastorino Revert f1c13b0 75015d1
Commits on Nov 29, 2010
@jhawthorn jhawthorn test case on has_one :through after a destroy
[#6037 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
52e854e
Commits on Dec 01, 2010
@thilo thilo ActiveModel::Errors.to_hash returns plain OrderedHash and used in to_…
…json serialization to properly handle multiple errors per attribute

Signed-off-by: José Valim <jose.valim@gmail.com>
d321e78
@tenderlove tenderlove avoid deprecated methods a5e7d9f
Commits on Dec 02, 2010
@NZKoz NZKoz Work around a strange piece of Syck behaviour where it checks Model#r…
…espond_to? before initializing the object.

Things like YAML.load(YAML.dump(@post)) won't work without this.
9381eb3
@tenderlove tenderlove fixing space errors c42a7c6
@tenderlove tenderlove adding a test for YAML round trip 873616c
Commits on Dec 05, 2010
Peter Baker Explain actionamailer authentication types 4808875
@kotfu kotfu Fixed typo in code for Session Expiry 6f6a24e
@gjastrab gjastrab fixed example code for i18n exception handling 6f32809
@cylence cylence Corrected typo and wording. 1c6effc
@asanghi asanghi Resolves LH #6063, should be :expires_in not :expire_in b05b8d9
@asanghi asanghi grammar fix c793baa
@amatsuda amatsuda Added a space before "do" keyword 7da5f75
@amatsuda amatsuda s/myqsl/mysql/ 97e8bf6
@neerajdotname neerajdotname make it clear that recompilation happens only in
development mode
8ff7cd9
@radar radar Mention filter_parameters for config 27ce3e2
@radar radar Add documentation for secret_token to config guide cbe64d0
@radar radar allow_concurrency is a "global" configuration option in Rails 3 a99dc08
@radar radar Mention threadsafe! method in config guide 08f6b4e
@radar radar Change coloriz_logging description to follow the standard for this guide cbea902
@radar radar Move consider_all_requests_local to global config methods in config g…
…uide
5969a84
@radar radar Move threadsafe warning to threadsafe's new location in config guide 9dc463b
@radar radar Mention controller_paths in the config guide 95ac8b0
@radar radar No more app_generators method in 3.1 ebc52a8
@radar radar Add asset_host and asset_path to the configuring guide 195d0b7
@radar radar Mention encoding in config guide 78b480c
@radar radar Add mention of helper_paths to config guide 730480a
@radar radar Reorder logger and middleware global config options b6bcfcb
@radar radar asset_host and asset_path are now set at the global level a416766
@radar radar Fix documentation regarding the initialization events of the Rails stack 04507ac
@radar radar Use ARel for Range Conditions section, remove Date & Time section bec…
…ause users should *never* do that.
00fb5dc
@radar radar Bring order description in line with actual text. abc7e38
@radar radar re-add config.action_controller.asset_host and asset_path to config g…
…uide
7d334c4
@radar radar Add documentation for page_cache_directory and page_cache_extension t…
…o config guide
36fd1a9
@radar radar Add perform_caching to config guide 554e89f
@neerajdotname neerajdotname Rewording existing comment e6f2ef3
@neerajdotname neerajdotname Add comment for config_accessor method 30d7a71
@neerajdotname neerajdotname Rewording existing comment 2b26ba6
@radar radar Mention that the documentation of create_file can be found on rdoc.in…
…fo ino the generators guide
198c126
@radar radar Begin covering application templates in the generators guide 40f7246
@radar radar Covering generator methods provided by Rails in the generators guide feab0b8
@radar radar For templates' gem method, :env is deprecated, use :group instead 4548c84
@radar radar Add gem method documentation to the generators guide 9177e93
@radar radar Finish documenting generator / template methods for the generators guide a86be8c
@radar radar Add missing colons on the end of before_initialize and after_initiali…
…ze documentation in configuring guide
741f7b5
@radar radar Add mention of config.to_prepare in configuring guide 350818f
@radar radar Config guide: Rails has *5* initialization events ceb650a
@radar radar Configuring guide: Adding mention of the initializer method. f7c85da
@radar radar Move Rails Environment settings to above the initialization events in…
… the config guide
b181968
@radar radar Config guide: separate the initialization events and initializer meth…
…od documentation
e523adb
@radar radar Config guide: Add config.active_support.bare 4e2f947
@radar radar Clarify that preload_frameworks defaults to nil f02c89f
@radar radar Config guide: clarify what cache_store defaults to. c3e8bf0
@radar radar Config guide: Mention ActionDispatch::Callbacks methods: before, to_p…
…repare and after
7174f14
@radar radar Remove extra f 2021596
@radar radar Config guide: add tld_length to ActionDispatch section 488992f
@radar radar Config guide: Add cache_asset_ids 1a7958d
@radar radar Config guide: should use config.action_dispatch.tld_length to set the…
… TLD
f0d893d
@radar radar Config guide: Add javascript_expansions and stylesheet_expansions 85ced0f
@radar radar Config guide: begin documenting the initializers 2484b7e
@radar radar Config guide: continuing work on documenting the initializers 13a7302
Commits on Dec 08, 2010
@neerajdotname neerajdotname Add to documentation that action caching does
handle HTTP_ACCEPT attribute properly and might
provide wrong result. Use params[:format] to
avoid this issue.
ee6b45a
@fxn fxn makes a pass to the action caching rdoc 75faf54
@asanghi asanghi Ensure that boolean false is properly serialized [#6079 state:resolved] 97e9d88
Commits on Dec 09, 2010
@michaeldv michaeldv Take into account current time zone when serializing datetime values [#…
…6096 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
6dcde27
@neerajdotname neerajdotname Ensure that while caching a page rails takes into
account the resolved mime type for the request

This is a port of fix on master to 3-0-stable

Signed-off-by: José Valim <jose.valim@gmail.com>
890d005
@neerajdotname neerajdotname Do not send id for quoting twice if the primary key is string.
[#6022 state:resolved]
d67464a
@tenderlove tenderlove just wrap as a sql literal 60744d2
Robert Pankowecki (Gavdi) Simplifies observer implementation [#6065 state:resolved] 61f2d52
@matthewrudy matthewrudy Fix Bug: disable_referential_integrity doesn't work for postgres 9.0.1 f33968a
@matthewrudy matthewrudy Cleaner way to extract the Postgres version d2003a2
Commits on Dec 10, 2010
@git2samus git2samus typo b4b6ffe
Commits on Dec 11, 2010
@vijaydev vijaydev fixed typo in test method name ab88074
@lucascaton lucascaton Fix link on generations' page 6103f8f
@evtuhovich evtuhovich Fix doc about nested transaction rollback
Because AR::Rollback do not reraise and inner transaction is not "real"
nothing rollback at all
3a62526
@radar radar Config guide: eager_load_paths by default contains every directory in…
… the app directory
9d93358
@radar radar Config guide: add session store config option 92668f6
@radar radar Config guide: add further initializers f0029d0
@radar radar Config guide: Space out initialization events to improve readability 85a940f
@radar radar Add note which links to documentation regarding the types of columns …
…available.
72476b6
@radar radar Config guide: Use bold titles for initializers instead of headings. 8aec8b8
@radar radar Move ActiveModel::Lint::Tests documentation to be above module declar…
…ation so it appears in the API docs for this module.
44f3380
@radar radar mapper.rb: add "options" to make the default-to-namespace-name line r…
…ead better
eb683d7
@radar radar indent code samples for mount doc d3d23e2
@radar radar root route should go at the *top* of the routes file, because it is t…
…he most popular route and should be matched first
d575229
@radar radar root method options are the same as the match method 55a232a
@radar radar Action Controller Overview: Remove dead link to the API docs for filters 6276334
@vijaydev vijaydev fixed typos and rephrased few sentences in routing 51202a1
@fxn fxn testing guide: revises explanation of the test macro 01c76d5
@fxn fxn spaces with underscores, I mean 37b9d02
@fxn fxn reviews commit 53bbbcc 9254750
Commits on Dec 15, 2010
@radar radar Provide an example for ActionDispatch::Routing::Mapper#scope f5c15a4
@paulodeon paulodeon Updated generator guide for rails commit 7891de8 ee9fea6
@vijaydev vijaydev fixed typos and rephrased a few sentences; also removed reference to …
…status codes being located in action_controller/status_codes.rb
8000719
@vijaydev vijaydev fixed typos in mailer f840d5c
@radar radar Remove nodoc from FormBuilder because the methods inside are public A…
…PI methods
7e0cc43
@radar radar Fix indentation on the namespace method's documentation 6bf482e
@umarsheikh umarsheikh for the root route to work, we need to delete the public/index.html.erb
file as well
8fdf531
@remear remear Added :placeholder option to ActionView::Helpers::FormTagHelper text_…
…field_tag
becb008
@elben elben It should be ActiveModel::Validator, not ActiveRecord::Validator. 463522a
@radar radar Active Support coreext guide: Logger core extension documentation 3392b56
@asanghi asanghi eternal confusion! fixed doco to inform correctly dfecb3f
@vijaydev vijaydev filter_parameter_logging is deprecated in Rails 3. Changed it to conf…
…ig.filter_parameters
34ed401
@vijaydev vijaydev fixed font 0a42961
@vijaydev vijaydev fixed link to ruby-prof acd716b
Commits on Dec 17, 2010
@drogus drogus Allow to use BUNDLE_GEMFILE env variable in boot.rb [#6184 state:reso…
…lved]
d1b4f3b
@drogus drogus Use require 'bundler/setup' instead of directly calling Bundler.setup…
… in config/boot.rb
0646c70
Commits on Dec 18, 2010
@dontangg dontangg Fixed number_with_precision rounding error [#6182 state:resolved] 177749b
@drogus drogus Use gemspec instead of gem rails in Gemfile f2fc81f
@dhh dhh Merge branch '3-0-stable' of github.com:rails/rails into 3-0-stable c09c8be
Commits on Dec 22, 2010
@drogus drogus Fix activesupport tests. These classes are not used anywhere d4cf636
@johnpaulashenfelter johnpaulashenfelter Added a word boundary to uncountable inflection regex for #singulariz…
…e so short inflections like ors do not affect larger words like sponsors [#6093 state:resolved]
cad4f00
@drogus drogus Ensure that uncountable are removed after test 725817e
@spastorino spastorino Avoid Bundler Resolver bug until they solve the issue 053031b
@spastorino spastorino This can make make included javascripts/stylesheets from expansions t…
…o be duplicated

or grow forever if you call register_*_expansion more than once

Fix a Regression introduced here 55b13c5
70dba74
@fxn fxn API guidelines: RDoc markup documentation has been moved in RDoc 3 bbb2252
Commits on Dec 23, 2010
@jonleighton jonleighton Test to verify that #2189 (count with has_many :through and a named_s…
…cope) is fixed [#2189 state:resolved]
90f55bd
@jonleighton jonleighton Fix problem where wrong keys are used in JoinAssociation when an asso…
…ciation goes :through a belongs_to [#2801 state:resolved]
e4b3842
Commits on Dec 28, 2010
@fxn fxn complete revision of the Contributing to Ruby on Rails guide
* adds instructions for PostgreSQL
* adds references to mysql2 here and there
* puts documentation contributions on par with code contributions
* adds a section about Rails Contributors
* documents C dependencies for Nokogiri and the database libs
* everything double-checked and revised step by step
* adds a section about warnings in the test suite
* removes section about the Rails wiki
* title and filename renamed
* overall rewording
3b35ff4
Commits on Dec 29, 2010
@lifo lifo Make serialized fixtures work again
Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
	activerecord/test/cases/base_test.rb
	activerecord/test/cases/quoting_test.rb
b5dc2a2
@fxn fxn since a lot of people use Ubuntu, document specific aptitude calls fo…
…r some C dependencies in the contrib guide
b9dd3f9
@fxn fxn renames the contrib guide in the index a2ddf5a
Commits on Dec 30, 2010
@apotonick apotonick process_action accepts multiple args, even with Callbacks. 8d1a318
@fxn fxn contrib_guide.gsub!("aptitude", "apt-get")
It turns out aptitude has been removed from Ubuntu 10.10
and while you can manually install it, apt-get is the
blessed package manager. Google for "aptitude removed
from Ubuntu" for more details. Thanks to Rafael Mendonça
França for pointing this out.
1a26036
@lifo lifo Make sure Model#touch doesn't try to update non existing columns a49a84f
Commits on Jan 01, 2011
@sikachu sikachu Make sure that generator's default banner is showing its namespace
This will make `rails g rspec:install --help` shows "rails generate rspec:install [options]" and not "rails generate install  [options]"
6ae9e9b
Commits on Jan 03, 2011
Robert Pankowecki (Gavdi) Added one more failing test for bug #6036 af2999d
Robert Pankowecki (Gavdi) Use id instead of quoted_id to prevent double quoting. Fixes failing …
…test for bug #6036.
e95b5b3
Commits on Jan 04, 2011
@lifo lifo Bump rack-test version b7bb795
Commits on Jan 05, 2011
Hemant Kumar fix difference between behaviour of blank and empty
Signed-off-by: José Valim <jose.valim@gmail.com>
05da752
Commits on Jan 09, 2011
@lardawge lardawge Backport tests for subclassed arrays 9bc338e
@jrallison jrallison Improve select helpers by allowing a selected value of false. This is…
… useful when using a select helper with a boolean attribute, and the attribute is false. (e.g. f.select :allow_comments)
9ab3ceb
@bluetrans-deploy bluetrans-deploy use Object#class instead of Object#type 9933859
Commits on Jan 10, 2011
@krekoten krekoten Refactor to handle the X-Cascade without having to raise an exception 117cad8
@bluetrans-deploy bluetrans-deploy primary_key is returned as either string or symbol, in columns loop m…
…ap everything to string
2deaa25
@tenderlove tenderlove calculate to_s on the primary key once 09f3736
@tenderlove tenderlove use SQLite3::VERSION rather than the deprecated class b7e5a64
@rsim rsim Always return decimal average of integer fields
In previous version if database adapter (e.g. SQLite and Oracle) returned non-String calculated values then type_cast_using_column converted decimal average value of intefer field to integer value. Now operation parameter is always checked to decide which conversion of calculated value should be done.
e1a064a
@tenderlove tenderlove adding to_d to BigDecimal 2cb497b
Commits on Jan 11, 2011
@ernie ernie Fix polymorphic belongs_to associationproxy raising errors when loadi…
…ng target.
97eddc0
Commits on Jan 12, 2011
@spastorino spastorino CI should run isolated tests 3b9e72b
@spastorino spastorino Allow view in AV::TestCase to access it's controller helpers methods 3f247cb
@joshk joshk In AS, only inflector/methods is need in proxy_wrappers.rb, as well a…
…s date, date_time, and time conversions.rb. This fixes an issue when requiring json and AS saying that i18n is also required.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c6d5414
@joshk joshk Fixed various isolated test missing requires within AS.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
35d5b64
@tenderlove tenderlove sorry, the CI cannot lie to us anymore 4781673
@tenderlove tenderlove reraising should be in the rescue block 20062e7
@tenderlove tenderlove use raise to create exceptions and to set the backtrace 8874733
@tenderlove tenderlove remove locales external to the system before assertion 58f90b2
@spastorino spastorino Reuse the view_context from the controller, this make the test enviro…
…nment more similar to the code applications uses
acecf00
@fxn fxn upgrades RDoc and horo dependencies
RDoc 2.x was missing some stuff, let's align this with master
5de1314
@spastorino spastorino Allow generators nested in more than one level 3667438
Commits on Jan 13, 2011
@tenderlove tenderlove include_in_memory? should check against @target list in case of new r…
…ecords. [#6257 state:resolved]
10fa49b
@spastorino spastorino Add missing require 0f5e815
@spastorino spastorino One more missing require f4dcf19
@spastorino spastorino sorry, the CI cannot lie to us anymore (Part II) 460f173
Commits on Jan 16, 2011
@tenderlove tenderlove updating sqlite3-ruby => sqlite3 9d87f41
@jonleighton jonleighton Added deprecation warning for has_and_belongs_to_many associations wh…
…ere the join table has additional attributes other than the keys. Access to these attributes is removed in 3.1. Please use has_many :through instead.
bcbff10
Commits on Jan 17, 2011
@tenderlove tenderlove minitest added @__io__, so we should ignore it too a58670b
Commits on Jan 18, 2011
@NZKoz NZKoz Use the derived request_method from AD::Request rather than the raw R…
…EQUEST_METHOD from rack.

This takes _method into account so the log shows the method which ActionController sees.
64c1cb3
@tenderlove tenderlove Changing sqlite3-ruby to sqlite3. backporting 8f88a28 to 3-0-stable. 97d4766
Commits on Jan 19, 2011
@jamis jamis make TestCaseTest work for pre-1.9 rubies, too fd19ade
@jamis jamis scrub instance variables from test cases on teardown
this prevents test state from accumulating, resulting in leaked
objects and slow tests due to overactive GC.
1e98920
@jamis jamis rein in GC during tests by making them run (at most) once per second
this can provide a significant performance boost during testing, by
preventing the GC from running too frequently.
35984f5
Frank Fischer Added a testcase for bug [#5329]
Signed-off-by: José Valim <jose.valim@gmail.com>
b4bc49c
@josevalim josevalim Solve SystemStackError when changing locale inside ActionMailer [#5329
…state:resolved]
46b23f8
@jamis jamis Revert "rein in GC during tests by making them run (at most) once per…
… second"

This reverts commit 35984f5.
039b807
@jamis jamis Revert "scrub instance variables from test cases on teardown"
This reverts commit 1e98920.
e5664b5
@jamis jamis Revert "make TestCaseTest work for pre-1.9 rubies, too"
This reverts commit fd19ade.
683cb50
Commits on Jan 24, 2011
@tenderlove tenderlove Merge remote branch 'jonleighton/deprecate_habtm_attributes-3-0-stabl…
…e' into 3-0-stable

* jonleighton/deprecate_habtm_attributes-3-0-stable:
  Added deprecation warning for has_and_belongs_to_many associations where the join table has additional attributes other than the keys. Access to these attributes is removed in 3.1. Please use has_many :through instead.
f420c2e
Commits on Jan 28, 2011
@spastorino spastorino Bump mail version up 5f509c2
Commits on Jan 29, 2011
@mikel mikel Fix gitignore to ignore tmp/ correctly, credit telemachus 54e72a5
Commits on Jan 30, 2011
@NZKoz NZKoz Prepare for the 3.0.4 release 0cbf9b2
Commits on Jan 31, 2011
@josevalim josevalim Fix AM tests 0448247
@NZKoz NZKoz Be sure to javascript_escape the email address to prevent apostrophes…
… inadvertently causing javascript errors.

This fixes CVE-2011-0446
e3dd210
@josevalim josevalim Ensure render is case sensitive even on systems with case-insensitive…
… filesystems.

This fixes CVE-2011-0449
6f80224
@josevalim josevalim Use Mime::Type references. ad9d21d
@tenderlove tenderlove limit() should sanitize limit values
This fixes CVE-2011-0448
354da43
@NZKoz NZKoz Change the CSRF whitelisting to only apply to get requests
Unfortunately the previous method of browser detection and XHR whitelisting is unable to prevent requests issued from some Flash animations and Java applets.  To ease the work required to include the CSRF token in ajax requests rails now supports providing the token in a custom http header:

 X-CSRF-Token: ...

This fixes CVE-2011-0447
66ce384
@NZKoz NZKoz Make rails.js include the CSRF token in the X-CSRF-Token header with …
…every ajax request.
7b64ade
Commits on Feb 01, 2011
@amatsuda amatsuda Make before_type_cast available for datetime fields
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c8b7606
@amatsuda amatsuda before_type_cast on Datetime tests for Mysql2Adapter
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4e6a102
@saimonmoore saimonmoore Additionally trigger i18n configuration setup before any eager loading [
#6353 state:resolved]

This handles the case where config.cache_classes is true and classes
are loaded before the I18n load path has had a chance to be populated.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
979f38a
@saimonmoore saimonmoore Ensure I18n setup is only executed once if triggered on eager loading [
…#6353 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
effb582
Commits on Feb 02, 2011
@rsim rsim fix for test_read_attributes_before_type_cast_on_datetime - Oracle ad…
…apter also returns Time value
8a73ebb
Commits on Feb 03, 2011
Anton Astashov Add a test for 'render :layout'
To make sure it will show block contents if it is placed after 'render
:partial'

[#5557 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
53b0235
@metaskills metaskills The type_cast_calculated_value method will trust DB types before cast…
…ing to a BigDecimal.

[#6365 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
068527b
Commits on Feb 04, 2011
@ef4 ef4 Fixing ordering of HABTM association deletion [#6191 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e142159
@spastorino spastorino git am is better here d00ed5a
@spastorino spastorino Remove stupid mistake f2d0257
Commits on Feb 08, 2011
@NZKoz NZKoz Prepare for the 3.0.4 release 1081ea6
@NZKoz NZKoz Merge branch '3-0-4-security' into 3-0-stable 84d608b
Commits on Feb 09, 2011
@fxn fxn adds RedCloth to the Gemfile, and defines a :doc group 27b8fb5
@tenderlove tenderlove comma limits do not make sense on oracle or pg ff00cd2
@joshk joshk fix for AS Gzip returning a UTF-8 string in Ruby 1.9 when it is actua…
…lly binary [#6386 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
31690ea
Santiago Pastorino and Emilio Tagua Add missing require 54dca98
@metaskills metaskills Allow limit values to accept an ARel SQL literal. 7530c52
@fxn fxn getting started guide: the generated application README has no extension 01ca46b
@fxn fxn now that the API guidelines are a guide, it is enough to assert that …
…the names of Rails components have a space, no need to say it was checked with David in the past
3306314
Commits on Feb 11, 2011
@carlosantoniodasilva carlosantoniodasilva Add missing deprecation require
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
401ee98
@tenderlove tenderlove skip this test on mysql2 as well 4433b50
@tenderlove tenderlove no more text-format for Ruby 1.9 compatibility cab7cb4
@tenderlove tenderlove psych does not emit a space after the type 4dc5505
Commits on Feb 12, 2011
@joshk joshk Fixes an issue when decoding a json string which looks like a date bu…
…t is invalid. This DateTime parse error is now caught and the original string is instead passed back [#6286 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e605165
@joshk joshk Updated the json date regex to recognize xmlschema formatted date tim…
…es during json decoding. [#3031 state:resolved]

Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
73b9e43
@amatsuda amatsuda avoid nil.dup
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
6e04f58
@amatsuda amatsuda do not to_s where you are testing that a string value is stored for t…
…he before_type_cast

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
cb045c0
@carlosantoniodasilva carlosantoniodasilva Add tests showing the LH issue #6381: fields_for with inline blocks a…
…nd nested attributes already persisted

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
640b1f0
@spastorino spastorino Backport fix from master: fields_for with inline blocks and nested at…
…tributes already persisted does not render properly

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4145810
Commits on Feb 13, 2011
@morgoth morgoth added proper require for ruby-debug19 gem to generated Gemfile
[#6419 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
9c6f9c9
@spastorino spastorino Make gem "ruby-debug19" require ruby-debug 22d1fee
@ernie ernie Deprecate Relation#& alias for Relation#merge 66003f5
@jonleighton jonleighton Deprecated support for interpolated association conditions with the :…
…conditions => 'foo = #{bar}' syntax, and added the new interpolation syntax which is :conditions => proc { "foo = #{bar}" }.
756e70c
@pixeltrix pixeltrix Fix assert_recognizes with block constraints [#5805 state:resolved] e9ae88a
@pixeltrix pixeltrix Remove incorrect assert_recognizes example cb9745b
Commits on Feb 14, 2011
@pixeltrix pixeltrix Remove incorrect assert_recognizes example c6ab3d1
@pixeltrix pixeltrix Add notes on how to override the default :id constraint [#5994 state:…
…resolved]
b4205b4
@pixeltrix pixeltrix Fix named route helper for routes nested inside deeply nested resources
[#6416 state:resolved]
64ca278
@pixeltrix pixeltrix Add test to prevent regression on namespace root nested in a resource
[#6389 state:resolved]
abea073
@tenderlove tenderlove Merge remote branch 'jonleighton/deprecate_string_interpolation-3-0-s…
…table' into 3-0-stable

* jonleighton/deprecate_string_interpolation-3-0-stable:
  Deprecated support for interpolated association conditions with the :conditions => 'foo = #{bar}' syntax, and added the new interpolation syntax which is :conditions => proc { "foo = #{bar}" }.
2b8fad6
Commits on Feb 15, 2011
@cris cris fixed broken link to postgresql docs
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e08873f
@jnimety jnimety GcTime incorrectly checks GC.respond_to?(:total_time), it should chec…
…k GC::Profiler.respond_to?(:total_time)

[#6435 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
0cee303
Commits on Feb 16, 2011
Dan Pickett handle double pluralization for irregular plurals
[#6363]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e925acb
@tukan tukan Fixed issue #6363, avoid to pluralized already pluralized names and s…
…ingularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case

[#6363 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
149c3d6
@tenderlove tenderlove explicitly anding queries of the same column 41c35ab
Commits on Feb 17, 2011
@tenderlove tenderlove updating changelog ff5db18
Commits on Feb 18, 2011
@fcheung fcheung Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453
…state:committed]

Signed-off-by: Xavier Noria <fxn@hashref.com>
d7b539a
Commits on Feb 21, 2011
@tenderlove tenderlove Gem.cache is going to be deprecated, use source_index instead 3ab82d8
Commits on Feb 22, 2011
@tenderlove tenderlove adding a test case for custom locking ac73f50
@NZKoz NZKoz Prepend the CSRF filter to make it much more difficult to execute app…
…lication code before it fires.
90aede6
@tenderlove tenderlove silencing deprecation spam 30a0e3f
Commits on Feb 23, 2011
@kamal kamal Fix observer callbacks firing multiple times on descendant instances ee491b0
@tenderlove tenderlove updating to 3.0.5.rc1 ef31b87