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

Patch for bug on RubyGems 1.3.5 in 2 3 stable #3133

Closed
wants to merge 861 commits into from

Conversation

vanderhoorn
Copy link
Contributor

Based on http://projects.puppetlabs.com/issues/8800 and #2818

Without it, my applications won't start at all (updated from Rails 2.3.10 to Rails 2.3.14)

amatsuda and others added 30 commits April 24, 2010 17:05
…e a magic comment and its source encoding doesn't match the default external encoding
…c comment renders a partial without one and its source encoding doesn't match the default external encoding
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
… serialize instances as hash of model name -> attributes hash rather than the bare attributes hash. [rails#2584 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Now works with :dependent => :destroy and includes unit tests for that
case.  Also includes better error messages when updating/deleting stale
objects.

[rails#1966 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
…state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
… same way as jeremy did with message verifier

[rails#4517 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
…tions un-touched

[rails#4514 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>

Conflicts:

	activerecord/test/cases/nested_attributes_test.rb
[rails#4532 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
… rails_xss plugin [rails#3767 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
…eters and a hash. ht: Marc-André Lafortune

[rails#4457 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Example:

  add_index(:accounts, :name, :name => 'by_name', :length => 10)
  => CREATE INDEX by_name ON accounts(name(10))

  add_index(:accounts, [:name, :surname], :name => 'by_name_surname', :length => {:name => 10, :surname => 15})
  => CREATE INDEX by_name_surname ON accounts(name(10), surname(15))

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
…resolved]" (breaks the build)"

This reverts commit eababa3.
…x test since SQLite returns Float.

[rails#4514 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
[rails#4529 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
…en the user uses select but does not specify the primary key

Signed-off-by: José Valim <jose.valim@gmail.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
gmarik and others added 25 commits April 14, 2011 13:48
- it was broken after
[commit](rails@e0eb8e9)
- there's also
[issue](https://rails.lighthouseapp.com/projects/8994/tickets/6634-railsrack-inconsistency-about-expires_afterexpires-cookie-option)

- also: maybe it worth making Rack understand :expire_after as we
duplicate same logic in [cookie_store](https://github.com/gmarik/rails/blob/v2.3.11/actionpack/lib/action_controller/session/cookie_store.rb#L114)

Signed-off-by: José Valim <jose.valim@gmail.com>
…the find_by_* method. Closes issue rails#330.

Commit fdfc8e3 introduced a bugfix to prevent additional values passed
to a dynamic find_or_create_by_x methods from confusing the finder.
This patch also broke the essential behavior of this method on an
association by incorrectly sending arguments to the find_by_x methods.
The finder method would always see its inputs as a single array of
values instead of individual arguments, almost guaranteeing that the
finder call would be incorrect, and that we'd always create a new
record instead.

This patch adds a splat operator to the parameter array we send along to
the dynamic finder so that it receives its inputs correctly, and
includes an additional test to ensure that repeated calls to
find_or_create_by_x only creates one new record.
Dynamic find_or_create_by_x_and_y always creates new records in Rails 2.3.11
Patch for issue 6440 - Session Reset undefined method `destroy' for {}:Hash
…VER change the semantics of the parent (returning nil if default).
name and requirement. Better, just activate the spec for the
dependency (1.8 only)
This may cause problems. I dunno.
The real solution is to get rid of all of this mess and use gem paths properly.
+ Fixed deprecated usage in gemspecs.

Bumped the version to 2.3.12 so I could test locally with actual
installs. If this is bad form for this project, please beat me up and
I'll split them out.
… This is the same API that ActiveModel ended up using and that won't be changing.
Fix OrderedHash merging with block given.
…sues/8800 on several projects when updating from Rails 2.3.10 to Rails 2.3.14 on RubyGems 1.3.5.


The patch mentioned in the pull request here: rails#2818 seems to work properly, although that pull request seems to include a whole load of other commits.
@vanderhoorn
Copy link
Contributor Author

How hard can it be to make a pull request for a stable branch... :/

@arunagw
Copy link
Member

arunagw commented Sep 26, 2011

I think you did something wrong here. It's having 250+ commits. you need to select proper branch.

@vijaydev
Copy link
Member

We are not fixing 2.3.x issues anymore.

@vanderhoorn
Copy link
Contributor Author

@arunagw: created a correct pull request: #3134

@vijaydev:

  1. Rails 2.3.14 introduced a bug, while it fixes security issues. What am I supposed to do? You cannot have a security release, then screw up in a point-release(!!!) and then say you don't want to patch the screw-up.
  2. This is another example of really bad release management. If you want to drop support for a branch that you kept up-to-date, that's fine, I can live with that. But then in projects that have some form of management, they give a deadline after which the support is dropped. You cannot say "from now on we don't support branch x anymore". That's just crap.
    But heh, I'm using Rails since version 1.1, so this form of bad release management doesn't actually surprise me... at all.

Oh yeah.. and maybe put on the actual website that you dropped support. OH!

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.