| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | Merge pull request #13962 from iwiznia/test_controller_skip_action_class | Yves Senn | 2014-02-07 | 1 | -0/+16 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Test for skipping a controller filter set up with a class Part 3 | |||||
| | * | | | | | Tests that skips a controller filters that was set up using a class | Ionatan Wiznia | 2014-02-06 | 1 | -0/+16 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch 'dump-schema-after-migration-flag' of ↵ | Xavier Noria | 2014-02-06 | 8 | -1/+84 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag Conflicts: activerecord/CHANGELOG.md | |||||
| | * | | | | | Add config to disable schema dump after migration | Emil Soman | 2014-02-06 | 8 | -1/+84 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a config on Active Record named `dump_schema_after_migration` * Schema dump doesn't happen if the config is set to false * Set default value of the config to true * Set config in generated production environment file to false * Update configuration guide * Update CHANGELOG | |||||
| * | | | | | | docs, Associations also raise on name conflicts. [ci skip] | Yves Senn | 2014-02-06 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470 | |||||
| * | | | | | | synchronize 4.1 release notes with CHANGELOGS. [ci skip] | Yves Senn | 2014-02-06 | 5 | -17/+95 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | /cc @chancancode | |||||
| * | | | | | | update contribution doc grammar. [ci skip] | dpmehta02 | 2014-02-06 | 1 | -5/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Manually applied from #13951. - Discussion at #13947. - Removed trailing whitespace from https://github.com/dpmehta02/rails/commit/18044e86af93672dfc38befbe974261e87b3518d /cc @dpmehta02 | |||||
| * | | | | | | Fix to_query with empty arrays too | Rafael Mendonça França | 2014-02-06 | 2 | -1/+8 | |
| | | | | | | | ||||||
| * | | | | | | Add CHANGELOG entry | Rafael Mendonça França | 2014-02-05 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13909 | |||||
| * | | | | | | Refatoring the method to avoid shot-circuit return | Rafael Mendonça França | 2014-02-05 | 2 | -4/+9 | |
| | | | | | | | ||||||
| * | | | | | | Test with a blank value | Rafael Mendonça França | 2014-02-05 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Move test to the right file | Rafael Mendonça França | 2014-02-05 | 2 | -11/+9 | |
| | | | | | | | ||||||
| * | | | | | | Fixed "Hash#to_param confused by empty hash values #13892" | Hincu Petru | 2014-02-05 | 2 | -0/+12 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #13953 from seanwalbran/fix-humanize-match-reference | Rafael Mendonça França | 2014-02-05 | 2 | -1/+5 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | fix interplay of humanize and html_escape | |||||
| | * | | | | | | fix interplay of humanize and html_escape | Sean Walbran | 2014-02-05 | 2 | -1/+5 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #13938 from marcandre/sized_enumerator | Rafael Mendonça França | 2014-02-05 | 7 | -30/+53 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Sized enumerator | |||||
| | * | | | | | | Return sized enumerator from Enumerable#index_by | Marc-Andre Lafortune | 2014-02-05 | 3 | -7/+6 | |
| | | | | | | | | ||||||
| | * | | | | | | Return sized enumerator from Batches#find_each | Marc-Andre Lafortune | 2014-02-05 | 6 | -4/+26 | |
| | | | | | | | | ||||||
| | * | | | | | | Return sized enumerator from Batches#find_in_batches | Marc-Andre Lafortune | 2014-02-05 | 3 | -4/+25 | |
| | | | | | | | | ||||||
| | * | | | | | | Strengthen test with different nb of rows and columns | Marc-Andre Lafortune | 2014-02-05 | 1 | -2/+4 | |
| | | | | | | | | ||||||
| | * | | | | | | Remove obsolete test (builtin group_by is now used) | Marc-Andre Lafortune | 2014-02-05 | 1 | -20/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | Remove obsolete line (was needed for Ruby 1.8.7 support) | Marc-Andre Lafortune | 2014-02-05 | 1 | -1/+0 | |
| |/ / / / / / | ||||||
| * | | | | | | remove gemnasium batch from README. [ci skip] | Yves Senn | 2014-02-05 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rails/rails gemnasium page (https://gemnasium.com/rails/rails) is not helping much. It lists 0 dependencies so there is not much to track. Also our gems mostly depend on other gems we control. There is not much point in monitoring them. The batch was introduced with #3909. | |||||
| * | | | | | | Removed unused commented code [ci skip] | Arun Agrawal | 2014-02-05 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in #13940 this can be removed We can document this somewhere else in testing guides. | |||||
| * | | | | | | Merge pull request #13950 from calvintam/fix_typos | Arun Agrawal | 2014-02-05 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed typos | |||||
| | * | | | | | | Fixed typos [ci skip] | Calvin Tam | 2014-02-05 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #13949 from vajrasky/fix_typo_column_definition_test | Yves Senn | 2014-02-05 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fixed typos in column_definition_test.rb. | |||||
| | * | | | | | | Fixed typo in column_definition_test.rb. | Vajrasky Kok | 2014-02-05 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | docs, AR already auto-detects primary keys. Closes #13946. [ci skip] | Yves Senn | 2014-02-05 | 3 | -6/+8 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This behavior was introduced since Rails 3.1 (207f266ccaaa9cd04cd2a7513ae5598c4358b510) but the docs were still out of date. | |||||
| * / / / / / | Document that enum conditions must use the ordinal value | Rafael Mendonça França | 2014-02-04 | 1 | -0/+2 | |
| |/ / / / / | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | Merge pull request #13943 from loganhasson/master | Rafael Mendonça França | 2014-02-04 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Add missing 'task' to note on Running Migrations | |||||
| | * | | | | | [ci skip] Add missing 'task' to note on Running Migrations | Logan Hasson | 2014-02-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Add CHANGELOG entry for #13935 [ci skip] | Rafael Mendonça França | 2014-02-04 | 1 | -0/+9 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #13935 from arthurnn/fix_12566 | Rafael Mendonça França | 2014-02-04 | 2 | -1/+16 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Make sure transaction state resets after commit | |||||
| | * | | | | | | Make sure transaction state resets after commit | Arthur Neves | 2014-02-03 | 2 | -1/+16 | |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | [fixes #12566] | |||||
| * | | | | | | Merge pull request #13940 from gregmolnar/guides | Arun Agrawal | 2014-02-04 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | add missing sharp [ci skip] | |||||
| | * | | | | | | add missing sharp [ci skip] | Greg Molnar | 2014-02-04 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | docs, link MySQL manual for multi column indexes. [ci ckip]. | Yves Senn | 2014-02-04 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9131. | |||||
| * | | | | | | Merge pull request #13899 from ↵ | Rafael Mendonça França | 2014-02-04 | 2 | -1/+11 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortisque/kevin/active_record_HABTM_with_belongs_to destruction errors out on HABTM w/out primary key | |||||
| | * | | | | | | fix HABTM w/out primary key errors on destruction | Kevin Casey | 2014-02-02 | 2 | -1/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399. | Yves Senn | 2014-02-04 | 3 | -1/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of `#to_key` (http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key) states that it returns `nil` if there are no key attributes. `to_param` needs to be aware of that fact and return `nil` as well. Previously it raised the following exception: ``` 1) Error: ConversionTest#test_to_param_returns_nil_if_to_key_is_nil: NoMethodError: undefined method `join' for nil:NilClass /Users/senny/Projects/rails/activemodel/lib/active_model/conversion.rb:65:in `to_param' /Users/senny/Projects/rails/activemodel/test/cases/conversion_test.rb:34:in `block in <class:ConversionTest>' ``` | |||||
| * | | | | | | | Merge pull request #13936 from edogawaconan/fix_docs | Guillermo Iguaran | 2014-02-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Missing closing parenthesis. [ci skip] | |||||
| | * | | | | | | Missing closing parenthesis. | edogawaconan | 2014-02-04 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #11770 from timruffles/doc_ajax_xhr | Yves Senn | 2014-02-03 | 1 | -2/+5 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | be more specific about csrf token and ajax - not whitelisted outside of jquery-rails [ci skip] | |||||
| | * | | | | | | be more specific about csrf token and ajax - not whitelisted outside of ↵ | Tim Ruffles | 2013-08-06 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jquery-rails [ci skip] | |||||
| * | | | | | | | docs, be clear that `options` is a hash. Closes #11904. [ci skip]. | Yves Senn | 2014-02-03 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | some wording format changes. [ci skip] | Yves Senn | 2014-02-03 | 2 | -6/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | pass `habtm :autosave` to underlying `hm:t` association. Closes #13923. | Yves Senn | 2014-02-03 | 4 | -8/+35 | |
| | | | | | | | | ||||||
| * | | | | | | | docs, revisit polymorphic associations with STI example. [ci skip] | Yves Senn | 2014-02-03 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #13926. /cc @fxn | |||||
| * | | | | | | | docs, reference to ruby-lang.org. refs #13492. [ci skip] | Yves Senn | 2014-02-03 | 1 | -4/+8 | |
| | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |