aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #10111 from Agis-/patch-1Carlos Antonio da Silva2013-04-051-4/+4
|\ \ \
| * | | Remove extra whitespaceAgis Anastasopoulos2013-04-061-4/+4
* | | | Update Rake tasks to call `rails test` insteadPrem Sichanugrist2013-04-051-7/+10
|/ / /
* | | Merge branch 'railstest'Aaron Patterson2013-04-057-92/+95
|\ \ \
| * \ \ Merge branch 'master' into railstestAaron Patterson2013-04-0549-94/+345
| |\ \ \
| * | | | do not blow away the test database on every runAaron Patterson2013-04-051-10/+0
| * | | | just check pending migrations in the current environmentAaron Patterson2013-04-051-2/+2
| * | | | check pending migrations against the test dbAaron Patterson2013-04-032-26/+4
| * | | | only match the default taskAaron Patterson2013-04-031-1/+1
| * | | | test no longer makes sense after requiring all test filesAaron Patterson2013-04-031-23/+1
| * | | | switch the testing tests to use rakeAaron Patterson2013-04-031-20/+23
| * | | | a test file can be provided to rake, e.g.:Aaron Patterson2013-04-031-1/+10
| * | | | switch to Rails::TestTaskAaron Patterson2013-04-032-25/+34
| * | | | default task should also be in the test envAaron Patterson2013-04-031-1/+1
| * | | | ensure the schema checking is done in the dev connectionAaron Patterson2013-04-031-0/+8
| * | | | Revert "Update Rake tasks to call `rails test` instead"Aaron Patterson2013-04-032-41/+62
| * | | | Revert "Warning removed unused variable task_name"Aaron Patterson2013-04-031-0/+1
| * | | | apps that depend on active record should load fixturesAaron Patterson2013-04-032-10/+2
* | | | | Merge pull request #10110 from choudhuryanupam/masterCarlos Antonio da Silva2013-04-052-2/+1
|\ \ \ \ \
| * | | | | Removed space and unused classAnupam Choudhury2013-04-062-2/+1
* | | | | | Merge pull request #10108 from choudhuryanupam/masterRafael Mendonça França2013-04-051-1/+0
|\| | | | |
| * | | | | Removed unnecessary classAnupam Choudhury2013-04-061-1/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #9555 from tmm1/optimize-erbRafael Mendonça França2013-04-052-3/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | avoid extra method calls for appending newlinesAman Gupta2013-03-041-1/+27
| * | | | Use ActionView::OutputBuffer#safe_append= from templatesAman Gupta2013-03-042-3/+9
* | | | | Improve the changelog entry [ci skip]Rafael Mendonça França2013-04-051-3/+4
* | | | | Merge pull request #10106 from rmm5t/fix-explicit-name-on-multiple-fields-masterRafael Mendonça França2013-04-053-8/+24
|\ \ \ \ \
| * | | | | Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-8/+24
|/ / / / /
* | | | | Merge pull request #10098 from subwindow/postgres_dump_bigint_defaultRafael Mendonça França2013-04-054-1/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Correctly parse bigint defaults in PostgreSQLErik Peterson2013-04-054-1/+12
* | | | | Move changelog to the top [ci skip]Carlos Antonio da Silva2013-04-051-17/+17
* | | | | Fix indent and remove extra white spacesCarlos Antonio da Silva2013-04-051-15/+17
* | | | | Merge pull request #9996 from mikz/masterJon Leighton2013-04-053-0/+34
|\ \ \ \ \
| * | | | | fix inverse_of association in block of new childMichal Cichra2013-04-013-0/+34
* | | | | | Merge pull request #10058 from jamesgolick/masterJon Leighton2013-04-052-5/+3
|\ \ \ \ \ \
| * | | | | | Refactor CollectionProxy#scope to avoid calling #extend.James Golick2013-04-022-5/+3
* | | | | | | Fix scope chaining + STIJon Leighton2013-04-054-11/+5
* | | | | | | failing test for #9869Neeraj Singh2013-04-052-0/+6
* | | | | | | Merge pull request #10102 from xxxcaqui/masterCarlos Antonio da Silva2013-04-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Sort modules in alphabetical order.Shunsuke Osa2013-04-051-2/+2
| | |_|/ / / / | |/| | | | |
* / | | | | | Improve `belongs_to touch: true` timestamp testAndrew White2013-04-051-7/+21
|/ / / / / /
* | | | | | Avoid an attempt to fetch old record when id was not present in touch callbackCarlos Antonio da Silva2013-04-041-7/+7
* | | | | | Use the correct pk field from the reflected class to find the old recordCarlos Antonio da Silva2013-04-041-1/+2
* | | | | | Refactor mail_to to not generate intermediate hashes when adding hrefCarlos Antonio da Silva2013-04-041-5/+6
* | | | | | Ensure mail_to helper does not modify the given html options hashCarlos Antonio da Silva2013-04-042-4/+10
* | | | | | Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-043-5/+30
|\ \ \ \ \ \
| * | | | | | Add block support for the helperSam Pohlenz2013-04-033-5/+30
* | | | | | | Merge pull request #10092 from amco/masterCarlos Antonio da Silva2013-04-041-10/+16
|\ \ \ \ \ \ \
| * | | | | | | Model generator USAGE doc improvedJason King2013-04-041-10/+16
* | | | | | | | Use inspect when writing the foreign key from the reflectionAndrew White2013-04-052-2/+8