| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | squelch an unused variable warning | Aaron Patterson | 2013-03-22 | 1 | -0/+1 | |
| |/ / | ||||||
| * | | Remove exception variable from rescue block | Carlos Antonio da Silva | 2013-03-22 | 1 | -2/+2 | |
| | | | | | | | | | | | Just raising from the rescue block will re-raise the exception, so the variable is not necessary. | |||||
| * | | Merge pull request #9866 from choudhuryanupam/fix_connection_test | Carlos Antonio da Silva | 2013-03-22 | 1 | -1/+1 | |
| |\ \ | | | | | | | Removed unused loop variable | |||||
| | * | | Removed unused loop variable | Anupam Choudhury | 2013-03-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schema_test | Carlos Antonio da Silva | 2013-03-22 | 1 | -2/+1 | |
| |\ \ \ | | | | | | | | | Removed unnecessary block | |||||
| | * | | | Removed unnecessary block | Anupam Choudhury | 2013-03-22 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #9871 from arunagw/stringio-require-jruby | Guillermo Iguaran | 2013-03-22 | 1 | -0/+1 | |
| |\ \ \ \ | | | | | | | | | | | StringIO is not required by default in JRuby | |||||
| | * | | | | StringIO is not required by default in JRuby | Arun Agrawal | 2013-03-22 | 1 | -0/+1 | |
| | |/ / / | ||||||
| * | | | | Don't kill the console | Jon Leighton | 2013-03-22 | 1 | -10/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Use the "quit" command instead. This seems to prevents some weirdness on OS X. See #9761. | |||||
| * | | | | Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_reset | Jon Leighton | 2013-03-22 | 1 | -0/+7 | |
| |\ \ \ \ | | | | | | | | | | | test-case to prevent resetting associations when preloading twice. | |||||
| | * | | | | test-case to prevent resetting associations when preloading twice. | Yves Senn | 2013-03-22 | 1 | -0/+7 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/preloader/through_association.rb activerecord/test/cases/associations/eager_test.rb | |||||
| * | | | | Merge pull request #9707 from route/updates_another_record | Jon Leighton | 2013-03-22 | 4 | -2/+18 | |
| |\ \ \ \ | |/ / / |/| | | | When strong_parameters had been included, this case of update became possible | |||||
| | * | | | When we pass id to update_attributes it will try to set new id for that record | Dmitry Vorotilin | 2013-03-22 | 4 | -2/+18 | |
| |/ / / | ||||||
| * | | | Send SIGTERM, not SIGQUIT. | Jon Leighton | 2013-03-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | SIGTERM is the correct signal for a graceful exit. This will hopefully resolve #9761. | |||||
| * | | | Delete failing test | Jon Leighton | 2013-03-22 | 1 | -36/+0 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | I don't think this is testing anything useful, and the test code is exceedingly brittle. It is broken since 34c7e73c1def1312e59ef1f334586ff2f668246e because the test code makes assumptions about the implementation of PostgreSQLAdapter#active? which are incorrect after the commit. I could fix this test but it would be even more brittle (by stubbing the underlying @connection.connect_poll) and it doesn't test any complex logic. I conclude that it's not worth it. | |||||
| * | | Merge pull request #9863 from robertomiranda/require-bcrypt-ruby | Guillermo Iguaran | 2013-03-21 | 1 | -2/+7 | |
| |\ \ | | | | | | | Change Standard error when is required bcrypt-ruby and fails | |||||
| | * | | Change Standard error when is required bcrypt-ruby and fails | robertomiranda | 2013-03-21 | 1 | -2/+7 | |
| | | | | ||||||
| * | | | Merge pull request #9861 from pivotalcommon/master | Jeremy Kemper | 2013-03-21 | 2 | -1/+10 | |
| |\ \ \ | |/ / |/| | | Allow fixture_path to be a Pathname | |||||
| | * | | Allows setting fixture_path to a Pathname | Alexander Murmann and Can Berk Güder | 2013-03-21 | 2 | -1/+10 | |
| |/ / | ||||||
| * | | Merge pull request #9853 from wangjohn/adding_bang_to_raise_method | Rafael Mendonça França | 2013-03-21 | 6 | -8/+8 | |
| |\ \ | | | | | | | Adding a bang to method name of raise_on_type_mismatch. | |||||
| | * | | Adding a bang to method name of raise_on_type_mismatch. | wangjohn | 2013-03-21 | 6 | -8/+8 | |
| |/ / | ||||||
| * | | Merge pull request #9836 from Intrepidd/tidy-require | Carlos Antonio da Silva | 2013-03-21 | 2 | -6/+3 | |
| |\ \ | | | | | | | Tidying up some require and removing overhead caused by sorting | |||||
| | * | | Tidying up some require : removing useless sort and homogenizing with the ↵ | Intrepidd | 2013-03-20 | 2 | -6/+3 | |
| | | | | | | | | | | | | | rest of the code the wat the includes are done | |||||
| * | | | Merge pull request #9847 from vipulnsward/fix_sqlite_test | Rafael Mendonça França | 2013-03-21 | 2 | -3/+3 | |
| |\ \ \ | |_|/ |/| | | Fix copy table index test; Change == to ! on false in travis.rb | |||||
| | * | | Fix copy table index test; Change == to ! on false in travis.rb | Vipul A M | 2013-03-21 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | Merge pull request #7706 from iangreenleaf/multiple_counter_caches | Jeremy Kemper | 2013-03-20 | 11 | -9/+45 | |
| |\ \ \ | | | | | | | | | Update other counter caches on destroy | |||||
| | * | | | Update other counter caches on destroy | Ian Young | 2013-03-20 | 11 | -9/+45 | |
| | |/ / | ||||||
| * | | | Merge pull request #9802 from newsline/fix-broken-action-missing | Rafael Mendonça França | 2013-03-20 | 2 | -1/+13 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md | |||||
| | * | | | Fix broken ActionController#action_missing | Janko Luin | 2013-03-20 | 3 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | | A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing. | |||||
| * | | | | Merge pull request #9837 from kjg/no_scaffold_css_when_no_assets | Guillermo Iguaran | 2013-03-20 | 3 | -1/+6 | |
| |\ \ \ \ | |_|/ / |/| | | | Don't generate a scaffold.css when --no-assets is specified | |||||
| | * | | | Don't generate a scaffold.css if no-assets | Kevin Glowacz | 2013-03-20 | 3 | -1/+6 | |
| |/ / / | ||||||
| * | | | use `connect_poll` on pg so that reaping does not hurt the connection | Aaron Patterson | 2013-03-20 | 2 | -3/+4 | |
| | | | | ||||||
| * | | | Revert "default the reaping frequency to 10 seconds" | Aaron Patterson | 2013-03-20 | 1 | -1/+1 | |
| | |/ |/| | | | | | | | | | | | mysql can't handle a parallel thread pinging the connection, so we can get wrong results or segvs This reverts commit 7cc588b684f6d1af3e7fab1edfa6715e269e41a2. | |||||
| * | | Merge pull request #9833 from choudhuryanupam/fix_active_schema_test | Carlos Antonio da Silva | 2013-03-20 | 1 | -2/+1 | |
| |\ \ | | | | | | | Removed unnecessary block | |||||
| | * | | Removed unnecessary block | Anupam Choudhury | 2013-03-20 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | Properly named variable inside block | Anupam Choudhury | 2013-03-20 | 1 | -2/+2 | |
| |/ / | | | | | | | Closes #9824. | |||||
| * | | Merge pull request #9821 from vipulnsward/fix_typos_in_AR | Vijay Dev | 2013-03-20 | 5 | -6/+6 | |
| |\ \ | | | | | | | Fix some typos in AR- CHANGELOG, tests, method doc. fixed | |||||
| | * | | Fix some typos in AR- CHANGELOG, tests, method doc. fixed | Vipul A M | 2013-03-20 | 5 | -6/+6 | |
| | | | | ||||||
| * | | | Merge pull request #9825 from rShetty/patch-1 | Vijay Dev | 2013-03-20 | 1 | -1/+1 | |
| |\ \ \ | |/ / |/| | | Fix a typo | |||||
| | * | | Fix a typo | Rajeev N Bharshetty | 2013-03-20 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_version | Carlos Antonio da Silva | 2013-03-19 | 1 | -1/+1 | |
| |\ \ | | | | | | | Changed the call to .sort.last to .max when computing the migration version | |||||
| | * | | Changed the call to .sort.last to .max when computing the migration version. You | wangjohn | 2013-03-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | do not actually need to sort everything (incurs more cost than just a simple max). | |||||
| * | | | Merge pull request #9817 from knewter/fix-test-case-name-typo-in-ar | Carlos Antonio da Silva | 2013-03-19 | 1 | -2/+2 | |
| |\ \ \ | |/ / |/| | | Commas aren't comas. | |||||
| | * | | Commas aren't comas. | Josh Adams | 2013-03-19 | 1 | -2/+2 | |
| |/ / | | | | | | | Type a fixo. | |||||
| * | | Merge pull request #9794 from schneems/schneems/email-host | Andrew White | 2013-03-19 | 3 | -1/+26 | |
| |\ \ | | | | | | | Fix improperly configured host in generated urls | |||||
| | * | | Fix improperly configured host in generated urls | schneems | 2013-03-19 | 3 | -1/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the host in `default_url_options` is accidentally set with a protocol such as ``` host: "http://example.com" ``` then the generated url will have the protocol twice `http://http://example.com` which is not what the user intended. Likely they wanted to define a host `host: "example.com"` and a `protocol: "http://"` but did not know the convention. This may not the most common problem, but when it happens it can go undetected for a while. I accidentally added `http://` out of habit recently only to find all the links in my emails were broken after deploying a demo site to production. Rather than allow this accident go undetected, we can fix the problem in line by properly setting the protocol and host. I was able to find this related question on stack overflow: http://stackoverflow.com/questions/5878329/rails-3-devise-how-do-i-make-the-email-confirmation-links-use-secure-https-n where the answer was highly upvoted. This is based off of work in #7415 cc/ @pixeltrix ATP Action Mailer and Action Pack | |||||
| * | | | Remove mentions of "app" from http request docs [ci skip] | Carlos Antonio da Silva | 2013-03-19 | 1 | -12/+10 | |
| | | | | ||||||
| * | | | Merge pull request #9816 from sebasoga/strong_parameters_guide_fix | Guillermo Iguaran | 2013-03-19 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Fix guides error on error class name | |||||
| | * | | | Fix guides error on error class name | Sebastian Sogamoso | 2013-03-19 | 1 | -1/+1 | |
| |/ / / | | | | | | | The error that's raised in case the required key is missing it's actually `ActionController::ParameterMissing` not `ActionController::MissingParameter`. It's important to fix so that people reading the guides knows what error to rescue from when needed. | |||||
| * | | | Merge pull request #9529 from wangjohn/find_on_inverse_of_bugfix_9470 | Jeremy Kemper | 2013-03-19 | 3 | -2/+38 | |
| |\ \ \ | | | | | | | | | Find() on an association with an inverse will now scan existing in-memory records | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |