Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | No need to `readlines` then `join`, just use `read` :heart: | Arun Agrawal | 2011-11-17 | 1 | -1/+1 |
| | | | same as 4c1a1933cbc5ab96efe340a3b31ac5fee12c99c8 | ||||
* | Initialize our instance variables. | Aaron Patterson | 2011-11-16 | 1 | -1/+3 |
| | |||||
* | Merge pull request #3649 from indirect/remote_ip | Aaron Patterson | 2011-11-16 | 2 | -5/+7 |
|\ | | | | | Fixes for Request#remote_ip (no middleware, all proxies) | ||||
| * | the object itself isn't the IP, #to_s is the IP | Andre Arko | 2011-11-16 | 1 | -1/+1 |
| | | |||||
| * | :facepalm: Request#remote_ip has to work without the middleware | Andre Arko | 2011-11-16 | 2 | -3/+3 |
| | | |||||
| * | Revert "Revert "Merge pull request #3640 from indirect/remote_ip"" | Andre Arko | 2011-11-16 | 2 | -6/+8 |
| | | | | | | | | This reverts commit 8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f, because I have fixed the issues this commit caused in the next commit. | ||||
* | | No need to `readlines` then `join`, just use `read` :heart: | Aaron Patterson | 2011-11-16 | 1 | -1/+1 |
| | | |||||
* | | Adding a deprecation warning for use of the schema_info table. | Aaron Patterson | 2011-11-16 | 1 | -0/+2 |
| | | |||||
* | | Join method uses empty string by default, so remove it | Aaron Patterson | 2011-11-16 | 1 | -2/+2 |
| | | |||||
* | | dbfile isn't supported anymore, so remove | Aaron Patterson | 2011-11-16 | 1 | -3/+3 |
| | | |||||
* | | Reduce schema format tests | Aaron Patterson | 2011-11-16 | 1 | -10/+14 |
| | | |||||
* | | Move conditionals to separate tasks so they can be reused. | Aaron Patterson | 2011-11-16 | 1 | -7/+11 |
| | | |||||
* | | Merge pull request #3500 from olivierlacan/error-whitespace | Jon Leighton | 2011-11-16 | 1 | -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 Lacan | 2011-11-03 | 1 | -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-errors | Jon Leighton | 2011-11-16 | 2 | -0/+9 |
|\ \ \ | | | | | | | | | Becomes includes errors | ||||
| * | | | `ActiveRecord::Base#becomes` should retain the errors of the original object. | James Adam | 2011-11-16 | 2 | -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_remove | Jon Leighton | 2011-11-16 | 2 | -2/+1 |
|\ \ \ | |_|/ |/| | | Unused variable removed | ||||
| * | | Unused variable removed | Arun Agrawal | 2011-11-15 | 2 | -2/+1 |
| | | | |||||
* | | | removing some useless conditionals | Aaron Patterson | 2011-11-16 | 1 | -10/+8 |
| | | | |||||
* | | | Merge pull request #2948 from atambo/master | Aaron Patterson | 2011-11-16 | 1 | -38/+66 |
|\ \ \ | | | | | | | | | schema_format :sql should behave like schema_format :ruby | ||||
| * | | | schema_format :sql should behave like schema_format :ruby | Alex Tambellini | 2011-11-04 | 1 | -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 Leighton | 2011-11-16 | 3 | -6/+95 |
| | | | | | | | | | | | | | | | | This is for windows compatibility. Fixes #3644. | ||||
* | | | | fixing tests on PG | Aaron Patterson | 2011-11-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | bundler treats trunk ruby as ruby 1.9, hack around that for now | Aaron Patterson | 2011-11-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Substituted RailsCommands for Rails::Commands | Daniel Dyba | 2011-11-16 | 1 | -159/+161 |
| | | | | |||||
* | | | | Changed Commands module to RailsCommands. | Daniel Dyba | 2011-11-16 | 1 | -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_3483 | Aaron Patterson | 2011-11-16 | 2 | -6/+12 |
|\ \ \ \ | | | | | | | | | | | Fixes 3483 | ||||
| * | | | | Fixes issue #3483, regarding using a mixture of ranges and discrete values ↵ | Ryan Naughton | 2011-11-14 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | in find conditions. Paired with Joey Schoblaska. | ||||
| * | | | | Failing test case for issue #3483 | Gabriel Sobrinho | 2011-11-14 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
* | | | | Revert "Merge pull request #3640 from indirect/remote_ip" | Jon Leighton | 2011-11-15 | 2 | -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_ip | Yehuda Katz | 2011-11-15 | 2 | -6/+8 |
|\ \ \ \ | | | | | | | | | | | GetIp#to_s should never return nil. That's icky. | ||||
| * | | | | GetIp#to_s should never return nil. That's icky. | Andre Arko | 2011-11-14 | 2 | -6/+8 |
| |/ / / | |||||
* / / / | refactor test_multiple_of | Vijay Dev | 2011-11-16 | 1 | -4/+3 |
|/ / / | |||||
* | | | Merge pull request #3632 from indirect/b8c85de | Jon Leighton | 2011-11-14 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | unit test for fix from a few minutes ago | ||||
| * | | | add test for bug fixed in 4f2bf64 | Andre Arko | 2011-11-14 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge pull request #3631 from indirect/remote_ip | José Valim | 2011-11-14 | 2 | -8/+15 |
|\ \ \ | | | | | | | | | Force calculation of remote IP before using || operator | ||||
| * | | | Return the calculated remote_ip or ip | Andre Arko | 2011-11-14 | 1 | -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 code | Andre Arko | 2011-11-14 | 1 | -1/+7 |
| | | | | |||||
| * | | | cleaner names | Andre Arko | 2011-11-14 | 1 | -6/+6 |
|/ / / | |||||
* | | | Speed up attribute invocation by checking if both name and calls are compilable. | José Valim | 2011-11-14 | 3 | -29/+34 |
| | | | |||||
* | | | Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile | José Valim | 2011-11-14 | 2 | -0/+8 |
|\ \ \ | | | | | | | | | Added therubyrhino to default Gemfile under JRuby | ||||
| * | | | Added therubyrhino to default Gemfile under JRuby | Guillermo Iguaran | 2011-11-14 | 2 | -0/+8 |
| | | | | |||||
* | | | | Merge pull request #3628 from oscardelben/refactoring | Yehuda Katz | 2011-11-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | use any? instead of !empty? | ||||
| * | | | | use any? instead of !empty? | Oscar Del Ben | 2011-11-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add a note to REALEASING_RAILS about testing the gem locally before releasing | Jon Leighton | 2011-11-14 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | rake release should push the tag | Jon Leighton | 2011-11-14 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #3371 from yahonda/fix_ora_00932_error | Aaron Patterson | 2011-11-14 | 1 | -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 Honda | 2011-10-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Sync changelog entry | Jon Leighton | 2011-11-14 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Add note about checking postgres tests before release | Jon Leighton | 2011-11-14 | 1 | -0/+8 |
| |/ / / / |/| | | | |