Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #3625 from guilleiguaran/sprockets-2.1.0 | Jon Leighton | 2011-11-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Upgrade Sprockets to 2.1.0 | ||||
| * | | | | Upgrade Sprockets to 2.1.0 | Guillermo Iguaran | 2011-11-14 | 1 | -1/+1 |
| | |/ / | |/| | | | | | | | | | | This version brings bug fixes for performance and caching. | ||||
* | | | | Add note about syncing CHANGELOGs | Jon Leighton | 2011-11-14 | 1 | -0/+4 |
| | | | | |||||
* | | | | Sync CHANGELOGs from 3-1-stable | Jon Leighton | 2011-11-14 | 3 | -0/+42 |
| | | | | |||||
* | | | | Merge pull request #3622 from noefroidevaux/issue_3595 | Yehuda Katz | 2011-11-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix pull request #3609 | ||||
| * | | | | Fix pull request #3609 | Noé Froidevaux | 2011-11-13 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #3623 from indirect/remote_ip | José Valim | 2011-11-13 | 2 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | Remote IP fixes/cleanup | ||||
| * | | | | remove ignored flag, fixes warnings | Andre Arko | 2011-11-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | turns out the tests expect remote_addrs.first | Andre Arko | 2011-11-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | correctly raise IpSpoofAttackError message | Andre Arko | 2011-11-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | change tests to expect X-F-F over REMOTE_ADDR | Andre Arko | 2011-11-13 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-13 | 9 | -84/+100 |
|\ \ \ \ | |||||
| * | | | | copy edits in getting started guide | Vijay Dev | 2011-11-13 | 1 | -15/+12 |
| | | | | | |||||
| * | | | | Revert "Move Tip up higher so users who are fine with SQLite can skip to the ↵ | Vijay Dev | 2011-11-13 | 1 | -18/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next section" This reverts commit 4bf057b8661754948681a18cf17ff5676518d774. Reason: Prefer to keep the configuration of all databases at the same level | ||||
| * | | | | Revert "Use rails help new instead of rails new -h" | Vijay Dev | 2011-11-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 6ac65c92029d3eefd101f9458d86bae0314cd14c. | ||||
| * | | | | Revert "Update guide to use Ruby 1.9 hash syntax" | Vijay Dev | 2011-11-13 | 1 | -43/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 50a9de514f8724b04d3681aa9ca228a8ca490909. Reason: Let's keep the guides at 1.8 syntax |