aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6269 from edtsech/hash-except-testXavier Noria2012-05-111-0/+6
|\
| * Test Hash#except can receive more than one argument.Edward Tsech2012-05-111-0/+6
* | Merge pull request #6268 from carlesso/masterJosé Valim2012-05-112-2/+2
|\ \ | |/ |/|
| * In robots.txt, User-agent should be all downcase except for the first 'U', ac...Enrico Carlesso2012-05-112-2/+2
|/
* Copy literal route constraints to defaults - fixes #3571 and #6224.Andrew White2012-05-114-3/+69
* Fixes issue #6251David Padilla2012-05-101-1/+1
* Failing test for #6251Piotr Sarnacki2012-05-101-0/+7
* Return false for exists? with new records - fixes #6199.Andrew White2012-05-103-2/+3
* Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+36
* Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
* remove unnecessary 'examples' noise [ci skip]Vijay Dev2012-05-112-28/+18
* Merge pull request #6253 from rafmagana/masterJosé Valim2012-05-101-1/+1
|\
| * remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_ac...Rafael Magana2012-05-101-1/+1
* | Merge pull request #6252 from grosser/unless_exist_for_memory_storeJosé Valim2012-05-102-0/+8
|\ \ | |/ |/|
| * add unless_exist option to memory storegrosser2012-05-102-0/+8
|/
* Merge pull request #6244 from frodsan/fix_build_remove_keyJosé Valim2012-05-101-1/+1
|\
| * Remove key argument from run_callbacks to fix buildFrancesco Rodriguez2012-05-101-1/+1
|/
* Merge pull request #6242 from frodsan/fix_abstract_controllerJosé Valim2012-05-101-1/+1
|\
| * removing key argument from run_callbacks - fix buildFrancesco Rodriguez2012-05-101-1/+1
|/
* Merge pull request #6241 from frodsan/deprecate_key_callbacksJosé Valim2012-05-104-6/+7
|\
| * AS::Callbacks#run_callbacks remove key argumentFrancesco Rodriguez2012-05-104-6/+7
|/
* Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rbJeremy Kemper2012-05-092-81/+82
|\
| * Rename some variablesAlexey Muranov2012-05-092-78/+82
| * Remove unused private method in fixtures.rbAlexey Muranov2012-05-091-3/+0
| * Remove unused parameter in ::instantiate_fixturesAlexey Muranov2012-05-091-5/+5
* | Allow to run `connection_adapters/quoting_test.rb` independentlyPiotr Sarnacki2012-05-091-1/+3
* | Merge pull request #5362 from zenprogrammer/quoting_bugAaron Patterson2012-05-092-0/+12
|\ \
| * | Fixed bug in Quoting that caused classes to be quoted incorrectlyRyan Oblak2012-03-092-0/+12
* | | Merge pull request #6226 from gnufied/masterAaron Patterson2012-05-092-6/+33
|\ \ \
| * | | make both cached and record_updated accessors in one lineHemant Kumar2012-05-091-2/+1
| * | | after_commit :on => :update should be called when save isHemant Kumar2012-05-091-0/+7
| * | | Fix transaction state not changing when after record gets commitedHemant Kumar2012-05-092-6/+27
* | | | Merge pull request #6227 from mjtko/changelog-fixesVijay Dev2012-05-091-22/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Consistent CHANGELOG entry indentation.Mark J. Titorenko2012-05-091-22/+22
| * | | Add CHANGELOG section for unreleased Rails 3.2.4; document addition of #begin...Mark J. Titorenko2012-05-091-0/+11
|/ / /
* | | Refactor Generator class to not rely on in-place editing the controllerAndrew White2012-05-092-11/+16
* | | Fix bug when url_for changes controller.Nikita Beloglazov2012-05-092-2/+11
| |/ |/|
* | fix a couple of formatting issues [ci skip]Vijay Dev2012-05-091-2/+4
* | registers ceb1dcc in the CHANGELOGXavier Noria2012-05-091-0/+2
* | update some examples in asset tag helper docs [ci skip]Vijay Dev2012-05-091-15/+15
* | remove redundant and stray line [ci skip]Vijay Dev2012-05-091-2/+0
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-0814-139/+356
|\ \
| * | simplify the alias_attribute example [ci skip]Vijay Dev2012-05-081-20/+1
| * | cut some duplication and minor edits [ci skip]Vijay Dev2012-05-081-37/+4
| * | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered i...Mark J. Titorenko2012-05-081-92/+161
| * | Add example for image_submit_tag with confirmation. [ci skip]Edward Tsech2012-05-081-0/+3
| * | Add annotaion for class_eval in AbstractController#helper_method [ci skip]Edward Tsech2012-05-081-3/+3
| * | Improve readability of metaprogramming annotations at AbstractController call...Edward Tsech2012-05-081-10/+10
| * | added docs to alias_attribute methodFrancesco Rodriguez2012-05-071-0/+31
| * | added docs to cattr_readerFrancesco Rodriguez2012-05-071-0/+27