aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'dump-schema-after-migration-flag' of ↵Xavier Noria2014-02-068-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 migrationEmil Soman2014-02-068-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 Senn2014-02-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470
* | | | | | | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-065-17/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @chancancode
* | | | | | | update contribution doc grammar. [ci skip]dpmehta022014-02-061-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 tooRafael Mendonça França2014-02-062-1/+8
| | | | | | |
* | | | | | | Add CHANGELOG entryRafael Mendonça França2014-02-051-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13909
* | | | | | | Refatoring the method to avoid shot-circuit returnRafael Mendonça França2014-02-052-4/+9
| | | | | | |
* | | | | | | Test with a blank valueRafael Mendonça França2014-02-051-2/+2
| | | | | | |
* | | | | | | Move test to the right fileRafael Mendonça França2014-02-052-11/+9
| | | | | | |
* | | | | | | Fixed "Hash#to_param confused by empty hash values #13892"Hincu Petru2014-02-052-0/+12
| | | | | | |
* | | | | | | Merge pull request #13953 from seanwalbran/fix-humanize-match-referenceRafael Mendonça França2014-02-052-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix interplay of humanize and html_escape
| * | | | | | | fix interplay of humanize and html_escapeSean Walbran2014-02-052-1/+5
|/ / / / / / /
* | | | | | | Merge pull request #13938 from marcandre/sized_enumeratorRafael Mendonça França2014-02-057-30/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Sized enumerator
| * | | | | | | Return sized enumerator from Enumerable#index_byMarc-Andre Lafortune2014-02-053-7/+6
| | | | | | | |
| * | | | | | | Return sized enumerator from Batches#find_eachMarc-Andre Lafortune2014-02-056-4/+26
| | | | | | | |
| * | | | | | | Return sized enumerator from Batches#find_in_batchesMarc-Andre Lafortune2014-02-053-4/+25
| | | | | | | |
| * | | | | | | Strengthen test with different nb of rows and columnsMarc-Andre Lafortune2014-02-051-2/+4
| | | | | | | |
| * | | | | | | Remove obsolete test (builtin group_by is now used)Marc-Andre Lafortune2014-02-051-20/+0
| | | | | | | |
| * | | | | | | Remove obsolete line (was needed for Ruby 1.8.7 support)Marc-Andre Lafortune2014-02-051-1/+0
|/ / / / / / /
* | | | | | | remove gemnasium batch from README. [ci skip]Yves Senn2014-02-051-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 Agrawal2014-02-051-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_typosArun Agrawal2014-02-051-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed typos
| * | | | | | | Fixed typos [ci skip]Calvin Tam2014-02-051-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #13949 from vajrasky/fix_typo_column_definition_testYves Senn2014-02-051-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fixed typos in column_definition_test.rb.
| * | | | | | | Fixed typo in column_definition_test.rb.Vajrasky Kok2014-02-051-2/+2
| | | | | | | |
* | | | | | | | docs, AR already auto-detects primary keys. Closes #13946. [ci skip]Yves Senn2014-02-053-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 valueRafael Mendonça França2014-02-041-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #13943 from loganhasson/masterRafael Mendonça França2014-02-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Add missing 'task' to note on Running Migrations
| * | | | | | [ci skip] Add missing 'task' to note on Running MigrationsLogan Hasson2014-02-041-1/+1
| | | | | | |
* | | | | | | Add CHANGELOG entry for #13935 [ci skip]Rafael Mendonça França2014-02-041-0/+9
| | | | | | |
* | | | | | | Merge pull request #13935 from arthurnn/fix_12566Rafael Mendonça França2014-02-042-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make sure transaction state resets after commit
| * | | | | | | Make sure transaction state resets after commitArthur Neves2014-02-032-1/+16
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | [fixes #12566]
* | | | | | | Merge pull request #13940 from gregmolnar/guidesArun Agrawal2014-02-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add missing sharp [ci skip]
| * | | | | | | add missing sharp [ci skip]Greg Molnar2014-02-041-1/+1
|/ / / / / / /
* | | | | | | docs, link MySQL manual for multi column indexes. [ci ckip].Yves Senn2014-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9131.
* | | | | | | Merge pull request #13899 from ↵Rafael Mendonça França2014-02-042-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 destructionKevin Casey2014-02-022-1/+11
| | | | | | | |
* | | | | | | | `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399.Yves Senn2014-02-043-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_docsGuillermo Iguaran2014-02-031-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Missing closing parenthesis. [ci skip]
| * | | | | | | Missing closing parenthesis.edogawaconan2014-02-041-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #11770 from timruffles/doc_ajax_xhrYves Senn2014-02-031-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 Ruffles2013-08-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jquery-rails [ci skip]
* | | | | | | | docs, be clear that `options` is a hash. Closes #11904. [ci skip].Yves Senn2014-02-031-1/+1
| | | | | | | |
* | | | | | | | some wording format changes. [ci skip]Yves Senn2014-02-032-6/+6
| | | | | | | |
* | | | | | | | pass `habtm :autosave` to underlying `hm:t` association. Closes #13923.Yves Senn2014-02-034-8/+35
| | | | | | | |
* | | | | | | | docs, revisit polymorphic associations with STI example. [ci skip]Yves Senn2014-02-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #13926. /cc @fxn
* | | | | | | | docs, reference to ruby-lang.org. refs #13492. [ci skip]Yves Senn2014-02-031-4/+8
| | | | | | | |
* | | | | | | | `rails_guides/helpers.rb` requires `YAML` to run.Yves Senn2014-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve the following error when running `bundle exec rake guides:generate:html`: ``` /Users/senny/.rbenv/versions/2.0.0-p353/bin/ruby rails_guides.rb Generating 2_2_release_notes.md as 2_2_release_notes.html /Users/senny/Projects/rails/guides/rails_guides/helpers.rb:17:in `documents_by_section': uninitialized constant RailsGuides::Helpers::YAML (ActionView::Template::Error) from /Users/senny/Projects/rails/guides/rails_guides/helpers.rb:32:in `docs_for_menu' from /Users/senny/Projects/rails/guides/source/layout.html.erb:56:in `block in ___sers_senny__rojects_rails_guides_source_layout_html_erb___3094858039481335962_70118647133480' from /Users/senny/Projects/rails/guides/source/layout.html.erb:54:in `each' from /Users/senny/Projects/rails/guides/source/layout.html.erb:54:in `___sers_senny__rojects_rails_guides_source_layout_html_erb___3094858039481335962_70118647133480' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:143:in `block in render' from /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:161:in `instrument' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:337:in `instrument' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:141:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:61:in `render_with_layout' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:47:in `render_template' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:17:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/renderer.rb:42:in `render_template' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/renderer.rb:23:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/helpers/rendering_helper.rb:24:in `render' from /Users/senny/Projects/rails/guides/rails_guides/markdown.rb:160:in `render_page' from /Users/senny/Projects/rails/guides/rails_guides/markdown.rb:25:in `render' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:205:in `block in generate_guide' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:195:in `open' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:195:in `generate_guide' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:144:in `block in generate_guides' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:142:in `each' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:142:in `generate_guides' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:97:in `generate' from rails_guides.rb:63:in `<main>' rake aborted! Command failed with status (1): [/Users/senny/.rbenv/versions/2.0.0-p353/bi...] /Users/senny/Projects/rails/guides/Rakefile:11:in `block (3 levels) in <top (required)>' Tasks: TOP => guides:generate:html (See full trace by running task with --trace) ```
* | | | | | | | Merge pull request #13930 from calvintam/masterArun Agrawal2014-02-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed minor typo [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 16:55:08 +0000