| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #22598 from yui-knk/deprecate_string_callback | Rafael França | 2015-12-16 | 8 | -23/+31 |
|\ |
|
| * | Deprecate passing string to define callback. | yui-knk | 2015-12-16 | 8 | -23/+31 |
* | | Merge pull request #22611 from existent-co-uk/patch-1 | Rafael França | 2015-12-16 | 1 | -2/+2 |
|\ \ |
|
| * | | Fix a couple of grammatical errors in security.md | Existent Ltd | 2015-12-16 | 1 | -2/+2 |
* | | | Merge pull request #22612 from caike/master | Eileen M. Uchitelle | 2015-12-16 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Mention the correct way to halt callback chains | Carlos Souza | 2015-12-16 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch 'remove-test-case' | eileencodes | 2015-12-15 | 9 | -52/+64 |
|\ \ |
|
| * | | Run railties generated app tests in test env | eileencodes | 2015-12-15 | 1 | -3/+3 |
| * | | Update test generators to use ActionDispatch::IntegrationTest | Abdelkader Boudih | 2015-12-15 | 8 | -49/+61 |
|/ / |
|
* | | Do not default to any Serializer | Santiago Pastorino | 2015-12-15 | 3 | -8/+2 |
* | | Merge pull request #22562 from sblackstone/master | Jeremy Daer | 2015-12-15 | 2 | -2/+9 |
|\ \ |
|
| * | | Allow users to pass flags from database.yml | Stephen Blackstone | 2015-12-15 | 2 | -2/+9 |
* | | | Merge pull request #14212 from tylerhunt/fix-token-regex | Sean Griffin | 2015-12-15 | 2 | -1/+9 |
|\ \ \ |
|
| * | | | Handle tab in token authentication header. | Tyler Hunt | 2014-02-26 | 2 | -1/+9 |
* | | | | Remove warning of shadowing variable | Rafael Mendonça França | 2015-12-15 | 1 | -1/+1 |
* | | | | Merge pull request #22596 from y-yagi/remove_extra_space_from_deprecation_msg | Eileen M. Uchitelle | 2015-12-15 | 2 | -2/+5 |
|\ \ \ \ |
|
| * | | | | remove extra spaces from deprecation message | yuuji.yaginuma | 2015-12-15 | 2 | -2/+5 |
* | | | | | Merge pull request #22595 from sstephenson/fragment_cache_key | David Heinemeier Hansson | 2015-12-15 | 4 | -11/+77 |
|\ \ \ \ \ |
|
| * | | | | | Add fragment_cache_key macro for controller-wide fragment cache key prefixes | Sam Stephenson | 2015-12-14 | 2 | -3/+67 |
| * | | | | | Remove ActionView::Helpers::CacheHelper#fragment_cache_key | Sam Stephenson | 2015-12-14 | 3 | -8/+10 |
| |/ / / / |
|
* | | | | | Merge pull request #21538 from matthewd/migration-version | Matthew Draper | 2015-12-15 | 57 | -136/+226 |
|\ \ \ \ \ |
|
| * | | | | | Use a real migration version number in docs | Matthew Draper | 2015-12-15 | 9 | -54/+54 |
| * | | | | | Schema uses current migration API | Matthew Draper | 2015-12-15 | 1 | -1/+1 |
| * | | | | | In 4.2 migrations, `timestamps` defaulted to `null: true` | Matthew Draper | 2015-12-15 | 1 | -0/+24 |
| * | | | | | Find the delegate, even in a deeper inheritance tree | Matthew Draper | 2015-12-15 | 1 | -1/+5 |
| * | | | | | Internal test migrations use the private 'Current' version | Matthew Draper | 2015-12-15 | 40 | -64/+64 |
| * | | | | | Ensure generated migrations include a version number | Matthew Draper | 2015-12-15 | 3 | -14/+14 |
| * | | | | | Use a deliberately-invalid migration version in all doc examples | Matthew Draper | 2015-12-15 | 9 | -54/+54 |
| * | | | | | Add migration versioning via Migration subclasses | Matthew Draper | 2015-12-15 | 5 | -2/+64 |
|/ / / / / |
|
* | | | | | Ensure uuid-ossp extension is present before we rely on it | Matthew Draper | 2015-12-15 | 1 | -0/+2 |
* | | | | | Fix travis matrix | Rafael Mendonça França | 2015-12-14 | 1 | -1/+1 |
* | | | | | Add ruby-head back in the allow failures group | Rafael Mendonça França | 2015-12-14 | 1 | -0/+1 |
|/ / / / |
|
* | | | | Do now allow failures with Ruby 2.3 anymore | Rafael Mendonça França | 2015-12-14 | 1 | -2/+0 |
* | | | | Test with Ruby 2.3.0 | Rafael Mendonça França | 2015-12-14 | 1 | -0/+1 |
* | | | | Merge pull request #22564 from maximeg/legit_name_errors | Sean Griffin | 2015-12-14 | 2 | -2/+45 |
|\ \ \ \ |
|
| * | | | | Don't catch all NameError to reraise as ActionController::RoutingError #22368 | Maxime Garcia | 2015-12-12 | 2 | -2/+45 |
| | |/ /
| |/| | |
|
* | | | | Revert "Perform a more efficient query in `Relation#any?`" | Sean Griffin | 2015-12-14 | 3 | -8/+15 |
* | | | | Merge pull request #22561 from Cleggameg/patch-2 | Rafael Mendonça França | 2015-12-14 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Update seeds.rb.tt | Paul Clegg | 2015-12-14 | 1 | -2/+2 |
|/ / / / |
|
* | | | | Merge pull request #22395 from avokhmin/becomes-errors-base-2 | Sean Griffin | 2015-12-14 | 4 | -2/+43 |
|\ \ \ \ |
|
| * | | | | `ActiveRecord::Base#becomes` should copy the errors | Vokhmin Alexey V | 2015-12-14 | 4 | -2/+43 |
* | | | | | Perform a more efficient query in `Relation#any?` | Sean Griffin | 2015-12-14 | 2 | -8/+8 |
* | | | | | Merge pull request #22582 from sikachu/hwia-to_h | Kasper Timm Hansen | 2015-12-14 | 2 | -9/+11 |
|\ \ \ \ \ |
|
| * | | | | | Make Parameters#to_h and #to_unsafe_h return HWIA | Prem Sichanugrist | 2015-12-14 | 2 | -9/+11 |
* | | | | | | Fix test failures caused by 574f255 | Sean Griffin | 2015-12-14 | 1 | -1/+1 |
| |/ / / /
|/| | | | |
|
* | | | | | Use a bind param for `LIMIT` and `OFFSET` | Sean Griffin | 2015-12-14 | 5 | -13/+47 |
* | | | | | Deprecate limit strings with commas | Sean Griffin | 2015-12-14 | 2 | -3/+13 |
* | | | | | Merge pull request #22463 from tjblonsk/add_bug_report_to_contributing_md | Sean Griffin | 2015-12-14 | 1 | -7/+33 |
|\ \ \ \ \ |
|
| * | | | | | Add specific bug reporting guidelines to contributing.md. [ci skip] | Tim | 2015-12-11 | 1 | -7/+33 |
* | | | | | | Merge pull request #22209 from yui-knk/add_test_sanitize_sql_array_handles_na... | Sean Griffin | 2015-12-14 | 2 | -0/+19 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|