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 Feb 09, 2011
@tenderlove tenderlove rubygems 1.5.0 compatibility. Thanks Tim Serong abc06a2
Commits on Feb 20, 2011
@vijaydev vijaydev fix incorrect version in deprecation message
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
6c42c14
Commits on Mar 01, 2011
@robdimarco robdimarco Unit test that shows calling reset session twice results in an exception 589ce09
@robdimarco robdimarco Fixed bug 6440 by checking that destroy exists on the session 8ca8ac3
Commits on Apr 14, 2011
@gmarik gmarik respect :expire_after option
- it was broken after
[commit](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>
b0be721
Commits on Apr 28, 2011
@daphonz daphonz Fixing dynamic finders on associations to properly send arguments to …
…the find_by_* method. Closes issue #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.
9f7ff62
@josevalim josevalim Merged pull request #331 from daphonz/2-3-stable.
Dynamic find_or_create_by_x_and_y always creates new records in Rails 2.3.11
f424efe
@josevalim josevalim Merged pull request #198 from robdimarco/2-3-stable.
Patch for issue 6440 - Session Reset undefined method `destroy' for {}:Hash
d793a56
Commits on May 12, 2011
@zenspider zenspider Fix stupid emacsisms. Just makes things more readable. 8d4ca9e
@zenspider zenspider Fix broken GemDependency#==. You should ALWAYS check the class! 01a9fbb
@zenspider zenspider Removed buggy GemDependency#requirement override. Overrides should NE…
…VER change the semantics of the parent (returning nil if default).
c20a4d1
@zenspider zenspider Fixed buggy gem activation. Don't pass a dependency to gem, pass the
name and requirement. Better, just activate the spec for the
dependency (1.8 only)
4c37257
@zenspider zenspider Removed the bulk of the deprecations by simply not calling refresh.
This may cause problems. I dunno.
The real solution is to get rid of all of this mess and use gem paths properly.
3ad5fd1
Commits on May 25, 2011
@zenspider zenspider + Switched to newer rdoc and gem package tasks (and their requires).
+ 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.
79aa54d
Commits on Jun 07, 2011
@tenderlove tenderlove find the spec from the source index, then activate it a2a3413
Commits on Jun 09, 2011
@bcardarella bcardarella Remove deprecation warning for ActiveRecord::Errors#generate_message.…
… This is the same API that ActiveModel ended up using and that won't be changing.
1aae5e7
Commits on Jun 16, 2011
@Antiarchitect Antiarchitect Fix OrderedHash merging with block given. b2d4142
Commits on Jun 17, 2011
@Antiarchitect Antiarchitect Added tests for OrderedHash merging with block. b1c36b7
@josevalim josevalim Merge pull request #1740 from Antiarchitect/2-3-stable
Fix OrderedHash merging with block given.
8d02083
Commits on Jul 27, 2011
@fxn fxn contrib app minor tweak 78a1fda
Commits on Aug 04, 2011
@tenderlove tenderlove we should not ignore all gems in here b132992
Commits on Aug 16, 2011
@tenderlove tenderlove adding notification for rdoc bb99aa1
@tenderlove tenderlove fixing response splitting problem 11dafea
@tenderlove tenderlove bumping to 2.3.13 dea5a10
@tenderlove tenderlove 2.3.14. yay. :'( fb1588c
@tenderlove tenderlove fixing sql injection problem 6b46d65
@tenderlove tenderlove fixing strip tags vulnerability 60f783d
@tenderlove tenderlove fixing utf8 escape vulerability e0774e4
Something went wrong with that request. Please try again.