Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix date_select [3-2-stable] #4640

Closed
wants to merge 253 commits into from

Conversation

rafaelfranca
Copy link
Member

This fixes #4453 and #4633

josevalim and others added 30 commits December 20, 2011 12:39
Signed-off-by: José Valim <jose.valim@gmail.com>
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.
fix adding field_with_errors to date selects, closes rails#3487
Fix regression in select form helper when options are non-string values
…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.
… with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) rails#4051

Signed-off-by: José Valim <jose.valim@gmail.com>
…erer#determine_template

Signed-off-by: José Valim <jose.valim@gmail.com>
* '3-2-stable' of github.com:rails/rails:
  [docs] added missing "}" fixes rails#4126
vijaydev and others added 28 commits January 19, 2012 23:22
From 2c667f6.

Thanks @pwnall for the heads-up.

Conflicts:

	activerecord/lib/active_record/core.rb
Fix  GH rails#4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
…warnings

Assert with no deprecation warnings activesupport tests.
…value of $rails_rake_task if it is already set.

Fixes rails#4591.

Signed-off-by: José Valim <jose.valim@gmail.com>
3-2-stable: Fixed regression - unable to use a range as choices for form.select.
Fix ActiveSupport::Base64.decode64
Add missing require to Array#wrap in generators action methods
Conflicts:

	activesupport/test/callbacks_test.rb
date_select does not work when day is discarded, include blank option is
enabled and struct date itself is nil.
@rafaelfranca
Copy link
Member Author

Sorry =/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

has_many association primary_key option