aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #3500 from olivierlacan/error-whitespaceJon Leighton2011-11-161-0/+1
|\ \ \ | | | | | | | | CSS fix to prevent error output from being breaking out of body element.
| * | | CSS fix to prevent error output from being breaking out of body element.Olivier Lacan2011-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the white-space: pre-wrap adds extra line breaks to prevent the text from breaking out of the element's box. In this case single line output can be extremely long, breaking out the <body> element. See for reference: http://www.quirksmode.org/css/whitespace.html Before: http://link.olivierlacan.com/BVU4 After: http://link.olivierlacan.com/BUfM
* | | | Merge pull request #3438 from lazyatom/becomes-includes-errorsJon Leighton2011-11-162-0/+9
|\ \ \ \ | | | | | | | | | | Becomes includes errors
| * | | | `ActiveRecord::Base#becomes` should retain the errors of the original object.James Adam2011-11-162-0/+9
|/ / / / | | | | | | | | | | | | This commit contains a simple failing test that demonstrates the behaviour we expect, and a fix. When using `becomes` to transform the type of an object, it should retain any error information that was present on the original instance.
* | | | Merge pull request #3608 from arunagw/unused_var_removeJon Leighton2011-11-162-2/+1
|\ \ \ \ | |_|/ / |/| | | Unused variable removed
| * | | Unused variable removedArun Agrawal2011-11-152-2/+1
| | | |
* | | | removing some useless conditionalsAaron Patterson2011-11-161-10/+8
| | | |
* | | | Merge pull request #2948 from atambo/masterAaron Patterson2011-11-161-38/+66
|\ \ \ \ | | | | | | | | | | schema_format :sql should behave like schema_format :ruby
| * | | | schema_format :sql should behave like schema_format :rubyAlex Tambellini2011-11-041-38/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a db:structure:load task that is run instead of db:schema:load when schema_format is set to :sql. This patch also removes the prefixing of the structure.sql files to mimic the use of a single schema.rb file. The patch originates from github issue #715.
* | | | | Switch from marshal format to plain text for the encoding conversions dump. ↵Jon Leighton2011-11-163-6/+95
| | | | | | | | | | | | | | | | | | | | This is for windows compatibility. Fixes #3644.
* | | | | fixing tests on PGAaron Patterson2011-11-161-1/+1
| | | | |
* | | | | bundler treats trunk ruby as ruby 1.9, hack around that for nowAaron Patterson2011-11-161-1/+1
| | | | |
* | | | | Substituted RailsCommands for Rails::CommandsDaniel Dyba2011-11-161-159/+161
| | | | |
* | | | | Changed Commands module to RailsCommands.Daniel Dyba2011-11-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid a conflict that occurs when you add Rake to your Gemfile. There is a Commands Object in Rake that conflicts with the Commands module in plugin.rb. See rails issue #1866.
* | | | | Merge pull request #3634 from RyanNaughton/fixes_3483Aaron Patterson2011-11-162-6/+12
|\ \ \ \ \ | | | | | | | | | | | | Fixes 3483
| * | | | | Fixes issue #3483, regarding using a mixture of ranges and discrete values ↵Ryan Naughton2011-11-142-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | in find conditions. Paired with Joey Schoblaska.
| * | | | | Failing test case for issue #3483Gabriel Sobrinho2011-11-141-0/+4
| | |/ / / | |/| | |
* | | | | Revert "Merge pull request #3640 from indirect/remote_ip"Jon Leighton2011-11-152-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6491aadc525b8703708e0fd0fbf05bd436a47801, reversing changes made to 83bf0b626cf2134260903e57d74f67de57384073. See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for explanation.
* | | | | Merge pull request #3640 from indirect/remote_ipYehuda Katz2011-11-152-6/+8
|\ \ \ \ \ | | | | | | | | | | | | GetIp#to_s should never return nil. That's icky.
| * | | | | GetIp#to_s should never return nil. That's icky.Andre Arko2011-11-142-6/+8
| |/ / / /
* / / / / refactor test_multiple_ofVijay Dev2011-11-161-4/+3
|/ / / /
* | | | Merge pull request #3632 from indirect/b8c85deJon Leighton2011-11-141-0/+5
|\ \ \ \ | | | | | | | | | | unit test for fix from a few minutes ago
| * | | | add test for bug fixed in 4f2bf64Andre Arko2011-11-141-0/+5
|/ / / /
* | | | Merge pull request #3631 from indirect/remote_ipJosé Valim2011-11-142-8/+15
|\ \ \ \ | | | | | | | | | | Force calculation of remote IP before using || operator
| * | | | Return the calculated remote_ip or ipAndre Arko2011-11-141-1/+2
| | | | | | | | | | | | | | | This was an especially nasty bug introduced in 317f4e2, by the way that an instance of GetIp is not nil, but GetIp#to_s could sometimes return nil. Gross, huh?
| * | | | memoize the relatively expensive remote IP codeAndre Arko2011-11-141-1/+7
| | | | |
| * | | | cleaner namesAndre Arko2011-11-141-6/+6
|/ / / /
* | | | Speed up attribute invocation by checking if both name and calls are compilable.José Valim2011-11-143-29/+34
| | | |
* | | | Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfileJosé Valim2011-11-142-0/+8
|\ \ \ \ | | | | | | | | | | Added therubyrhino to default Gemfile under JRuby
| * | | | Added therubyrhino to default Gemfile under JRubyGuillermo Iguaran2011-11-142-0/+8
| | | | |
* | | | | Merge pull request #3628 from oscardelben/refactoringYehuda Katz2011-11-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | use any? instead of !empty?
| * | | | | use any? instead of !empty?Oscar Del Ben2011-11-141-1/+1
| | | | | |
* | | | | | Add a note to REALEASING_RAILS about testing the gem locally before releasingJon Leighton2011-11-141-0/+9
| | | | | |
* | | | | | rake release should push the tagJon Leighton2011-11-141-0/+1
| | | | | |
* | | | | | Merge pull request #3371 from yahonda/fix_ora_00932_errorAaron Patterson2011-11-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix ORA-00932 error when trying to insert 0 to DATE type columns.
| * | | | | | Fix ORA-00932 error when trying to insert 0 to DATE type columns.Yasuo Honda2011-10-191-1/+1
| | | | | | |
* | | | | | | Sync changelog entryJon Leighton2011-11-141-0/+2
| | | | | | |
* | | | | | | Add note about checking postgres tests before releaseJon Leighton2011-11-141-0/+8
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #3625 from guilleiguaran/sprockets-2.1.0Jon Leighton2011-11-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Upgrade Sprockets to 2.1.0
| * | | | | | Upgrade Sprockets to 2.1.0Guillermo Iguaran2011-11-141-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | This version brings bug fixes for performance and caching.
* | | | | | Add note about syncing CHANGELOGsJon Leighton2011-11-141-0/+4
| | | | | |
* | | | | | Sync CHANGELOGs from 3-1-stableJon Leighton2011-11-143-0/+42
| | | | | |
* | | | | | Merge pull request #3622 from noefroidevaux/issue_3595Yehuda Katz2011-11-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix pull request #3609
| * | | | | | Fix pull request #3609Noé Froidevaux2011-11-131-1/+1
| |/ / / / /
* | | | | | Merge pull request #3623 from indirect/remote_ipJosé Valim2011-11-132-6/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remote IP fixes/cleanup
| * | | | | remove ignored flag, fixes warningsAndre Arko2011-11-131-1/+1
| | | | | |
| * | | | | turns out the tests expect remote_addrs.firstAndre Arko2011-11-131-1/+1
| | | | | |
| * | | | | correctly raise IpSpoofAttackError messageAndre Arko2011-11-131-2/+2
| | | | | |
| * | | | | change tests to expect X-F-F over REMOTE_ADDRAndre Arko2011-11-131-2/+2
|/ / / / /
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-139-84/+100
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:13:22 +0000