aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix layouts and rendering guide example using flash.now insteadCarlos Antonio da Silva2013-06-281-1/+1
| | | | Thanks @lintzchiang. [ci skip]
* Apply default scope when joining associations.Jon Leighton2013-06-283-0/+29
| | | | | | | | | | | | | | | | | | | For example: class Post < ActiveRecord::Base default_scope -> { where published: true } end class Comment belongs_to :post end When calling `Comment.join(:post)`, we expect to receive only comments on published posts, since that is the default scope for posts. Before this change, the default scope from `Post` was not applied, so we'd get comments on unpublished posts.
* Fix testJon Leighton2013-06-281-1/+8
| | | | | Oops. We need to estalish/remove the connection in the setup/teardown, else it messes with the fixtures.
* Fix rake test_sqlite3_memJon Leighton2013-06-282-11/+7
| | | | Clearly nobody uses this except me. It's fast people!
* Merge pull request #11153 from strzalek/remove-ar-deprecated-findersJon Leighton2013-06-287-637/+7
|\ | | | | Remove depreacted finders
| * Remove depreacted findersŁukasz Strzałkowski2013-06-287-637/+7
| | | | | | | | They were deprecated in 4.0, planned to remove in 4.1
* | Fix indentationAkira Matsuda2013-06-281-1/+1
| |
* | Merge pull request #11150 from ↵Carlos Antonio da Silva2013-06-272-19/+0
|\ \ | | | | | | | | | | | | jetthoughts/remove_depr_message_for_attribute_method_matcher Remove deprecation warning from AttributeMethodsMatcher
| * | Remove deprecation warning from AttributeMethodsMatcherPaul Nikitochkin2013-06-282-19/+0
|/ /
* | Merge pull request #11127 from jetthoughts/ask_user_add_line_to_routes_in_guideYves Senn2013-06-271-2/+2
|\ \ | | | | | | Asking user to declare post resource in getting start guide
| * | Asking user to declare post resource in guide [ci skip]Paul Nikitochkin2013-06-271-2/+2
|/ /
* | Merge pull request #11149 from strzalek/remove-protected-attrsCarlos Antonio da Silva2013-06-274-39/+0
|\ \ | | | | | | Remove deprecated attr_protected/accessible
| * | Remove deprecated attr_protected/accessibleŁukasz Strzałkowski2013-06-274-39/+0
| |/ | | | | | | Rails 4.0 has removed attr_protected and attr_accessible feature in favor of Strong Parameters.
* | Review AV changelog [ci skip]Carlos Antonio da Silva2013-06-271-2/+2
| |
* | Merge pull request #11147 from kennyj/remove_prompt_argument_was_deprecatedCarlos Antonio da Silva2013-06-273-26/+7
|\ \ | | | | | | Remove passing the prompt to grouped_options_for_select as an argument, because it was deprecated.
| * | Remove passing the prompt to grouped_options_for_select as an argument, ↵kennyj2013-06-283-26/+7
|/ / | | | | | | because it was deprecated.
* | Merge pull request #11141 from keydunov/masterYves Senn2013-06-271-1/+1
|\ \ | |/ |/| Fix documentation for grouped_collection_select
| * Fix documentation for grouped_collection_select [ci skip]Artyom2013-06-271-1/+1
| |
* | Merge pull request #11146 from kennyj/re-remove-deprecated-apiRafael Mendonça França2013-06-272-19/+0
|\ \ | | | | | | Re-remove deprecated API.
| * | Re-remove deprecated API.kennyj2013-06-282-19/+0
| | |
* | | Merge pull request #11145 from ↵Rafael Mendonça França2013-06-271-5/+5
|\ \ \ | |/ / |/| | | | | | | | JeffreyRodriguez/rails_4_root_directive_updates_and_fixes Removed "to:" from root directive and fixed typo ":to"
| * | Removed "to:" from root directive and fixed typo ":to"Jeff Rodriguez2013-06-271-5/+5
| | | | | | | | | | | | | | | `root :to` is invalid syntax `root to:` is valid, but the generated routes file omits `to:`
* | | Merge pull request #11144 from kennyj/fix_copyright_yearGuillermo Iguaran2013-06-271-1/+1
|\ \ \ | |/ / |/| | Fix copyright year for actionview [ci skip]
| * | Fix copyright year for actionview [ci skip]kennyj2013-06-281-1/+1
|/ /
* | Fix punctuation in config templatesAkira Matsuda2013-06-282-2/+2
| |
* | Merge pull request #11142 from tumayun/use_master_branch_activesupportRafael Mendonça França2013-06-271-1/+1
|\ \ | |/ |/| activerecord/examples/simple.rb use master branch activesupport gem
| * activerecord/examples/simple.rb use master branch activesupport gemtumayun2013-06-271-1/+1
|/
* Merge pull request #11139 from prathamesh-sonpatki/grammarYves Senn2013-06-271-3/+3
|\ | | | | fix grammar, change 'an' to 'a' [ci skip]
| * fix grammar, change 'an' to 'a' [ci skip]Prathamesh Sonpatki2013-06-271-3/+3
| |
* | Merge pull request #11054 from senny/11048_make_default_value_explicitCarlos Antonio da Silva2013-06-271-4/+2
|\ \ | | | | | | make default value for `:message` on `AM::Errors` explicit.
| * | make default value for `:message` on `AM::Errors` explicit.Yves Senn2013-06-221-4/+2
| | |
* | | Merge pull request #11133 from wangjohn/remove_deprecation_rake_taskYves Senn2013-06-271-18/+0
|\ \ \ | |_|/ |/| | Removing deprecation message and silencing method.
| * | Removing deprecation message and silencing method.wangjohn2013-06-261-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | The deprecation rake task is no longer useful because the deprecated methods have already been removed. The method for silencing stderr has been removed since it was only useful for `rake test:uncommitted` which was deprecated and removed.
* | | Merge pull request #11136 from prathamesh-sonpatki/rails4Yves Senn2013-06-271-1/+1
|\ \ \ | | | | | | | | Use activerecord 4.0.0 for reporting bugs using the template
| * | | Use activerecord 4.0.0 for reporting bugs using the template[ci skip]Prathamesh Sonpatki2013-06-271-1/+1
| |/ /
* | | Merge pull request #11137 from WvanLelyveld/masterSteve Klabnik2013-06-271-1/+1
|\ \ \ | |/ / |/| | There was a parenthesis in the guides, which resulted in the one link not working, and a second link not even showing. [ci skip]
| * | Fixing links to accept_language plugin/middlewareWouter van Lelyveld2013-06-271-1/+1
|/ /
* | Review railties changelog [ci skip]Carlos Antonio da Silva2013-06-261-5/+4
| |
* | Move delegation error constant to inside ModuleCarlos Antonio da Silva2013-06-262-3/+5
| |
* | Merge pull request #11124 from wangjohn/removing_deprecated_rake_tasksSantiago Pastorino2013-06-263-101/+6
|\ \ | | | | | | Removing deprecated rake tasks for tests
| * | Removing deprecated rake tasks.wangjohn2013-06-243-101/+6
| | | | | | | | | | | | | | | The `rake test:recent` and `rake test:uncommitted` tasks were deprecated and are now being removed.
* | | Merge pull request #11128 from edg3r/patch-1Yves Senn2013-06-261-1/+1
|\ \ \ | | | | | | | | linking small rails 4 features image to a bigger one
| * | | linking small rails 4 features image to a bigger one [ci skip]R4K32013-06-271-1/+1
| |/ / | | | | | | | | | | | | View a bigger version onclick https://github.com/rails/rails/issues/11100
* | | Merge pull request #10828 from southpolesteve/delegation_error_classYves Senn2013-06-262-2/+4
|\ \ \ | | | | | | | | Create DelegationError class
| * | | Add DelegationError class. Rasied by delegation to a nil objectSteve Faulkner2013-06-262-2/+4
| | | |
* | | | mention the removal of `--builder` in 4.0 release notes.Yves Senn2013-06-261-0/+4
| |/ / |/| |
* | | Merge pull request #11126 from ↵Rafael Mendonça França2013-06-261-1/+1
|\ \ \ | | | | | | | | | | | | | | | | tumayun/fix_activerecord_examples_performance_rb_syntax_error fix activerecord/examples/performance.rb#L101 syntax error
| * | | fix activerecord/examples/performance.rb#L101 syntax errortumayun2013-06-271-1/+1
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-06-2616-37/+69
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: guides/source/layout.html.erb
| * | | Remove a comment related to 920753fRobin Dupret2013-06-261-1/+0
| | | | | | | | | | | | Since 920753f, double assignment isn't used anymore
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 19:54:40 +0000