aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Execute default_scope defined by abstract class within the scope of subclassMehmet Emin İNAÇ2016-03-085-1/+38
|
* Merge pull request #24101 from mechanicles/remove-extra-theArun Agrawal2016-03-081-1/+1
|\ | | | | Remove extra 'the' and unwanted comma [ci skip]
| * Remove extra 'the' and unwanted comma [ci skip]Santosh Wadghule2016-03-081-1/+1
|/
* Merge pull request #24034 from kamipo/remove_outdated_commentArthur Nogueira Neves2016-03-071-1/+0
|\ | | | | Remove outdated comment [ci skip]
| * Remove outdated comment [ci skip]Ryuta Kamizono2016-03-041-1/+0
| | | | | | | | Currently column options handled by the type map in Rails 4.2.
* | Add changelog for batch touch records.Arthur Neves2016-03-071-0/+15
| | | | | | | | | | | | related to #19324 and #18606 [skip ci]
* | Merge pull request #23880 from bronson/extract-integration-behaviorRafael França2016-03-071-22/+35
|\ \ | | | | | | extract ActionDispatch::IntegrationTest::Behavior
| * | extract ActionDispatch::IntegrationTest::BehaviorScott Bronson2016-03-071-22/+35
| | | | | | | | | | | | | | | Similar to 176fbfd6, this makes it possible for other test frameworks to hook into Rails integration test facilities.
* | | move changelog to right place [skip ci]Arthur Neves2016-03-071-6/+6
| | |
* | | Add changelog for #20997Arthur Neves2016-03-071-0/+6
| | |
* | | Merge pull request #23922 from rthbound/fix-funny-spellingArthur Nogueira Neves2016-03-071-2/+2
|\ \ \ | |/ / |/| | Fixes funny spelling in an AR test
| * | Fixes funny spellingRyan T. Hosford2016-02-261-2/+2
| | | | | | | | | | | | - marked_for_destroyal -> marked_for_destruction
* | | Merge pull request #24095 from maclover7/rm-incorrect-exampleJon Moss2016-03-071-2/+2
|\ \ \ | | | | | | | | Remove incorrect Rack documentation example
| * | | Remove incorrect Rack documentation exampleJon Moss2016-03-071-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | `Sprockets` does not respond to the call method, so I changed the example to use a fake `MyRackApp`. Closes #22579. [ci skip]
* | | Merge pull request #23939 from akshaymohite/fix-configuration-tests-semanticsSean Griffin2016-03-071-2/+2
|\ \ \ | | | | | | | | Fixed semantics of couple of tests in the configuration_test.rb [ci skip]
| * | | Fixed couple of semantics in the configuration_test.rbAkshay2016-02-281-2/+2
| | | |
* | | | Merge pull request #23993 from kamipo/no_need_to_extract_limit_for_booleanSean Griffin2016-03-072-5/+1
|\ \ \ \ | | | | | | | | | | No need to extract a limit for a boolean type
| * | | | No need to extract a limit for a boolean typeRyuta Kamizono2016-03-042-5/+1
| | | | |
* | | | | Merge pull request #24086 from yui-knk/do_not_ad_integration_test_classYves Senn2016-03-073-2/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Prevent not-intended loading of `ActionDispatch::IntegrationTest`
| * | | | | Prevent not-intended loading of `ActionDispatch::IntegrationTest`yui-knk2016-03-073-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 9d378747326d26cf1afdac4433ead22967af0984 `ActionDispatch::IntegrationTest` class is loaded and defined in all Rails environments, not only test but also production. This is not-intended loading of a class which is only used in test environment. To prevent not-intended loading, add `ActiveSupport.run_load_hooks` to `ActionDispatch::IntegrationTest` with `action_dispatch_integration_test` name and use it in `ActionMailer`.
* | | | | | Merge pull request #24091 from mcfiredrill/fix-helper-method-docsRafael França2016-03-071-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | clarify that helper_method makes both methods available in the view [ci skip]
| * | | | | | clarify that helper_method makes both methods available in the viewTony Miller2016-03-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's probably obvious to most, but clarify that `:helper_method` will make both of these methods available to the view.
* | | | | | | Merge pull request #24090 from ↵Rafael França2016-03-061-6/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | meinac/silence_deprecation_warning_action_view_tests Silence deprecation message on action_view test cases
| * | | | | | Silence deprecation message for dynamic controller and actions on ↵Mehmet Emin İNAÇ2016-03-071-6/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | action_view test cases
* | | | | | Merge pull request #24085 from vipulnsward/i18n-test-additionKasper Timm Hansen2016-03-061-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | i18n fallbacks test fixes
| * | | | | | - Added i18n test to verify assigning hash directly to fallbacks instead of ↵Vipul A M2016-03-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using map - Fixed test name for setting fallbacks to config.i18n.fallbacks = [{ :ca => :'es-ES' }]
* | | | | | | prefer require_relative over require + File.expand_pathXavier Noria2016-03-064-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reads much better doesn't it.
* | | | | | | use __dir__ for relative paths in config/application.rbXavier Noria2016-03-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | | | | use __dir__ for relative paths in config/boot.rbXavier Noria2016-03-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | | | | use __dir__ to load the application in environment.rbXavier Noria2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | | | | use __dir__ to load the environment in config.ruXavier Noria2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stuff I see in passing while I am doing a walkthrough. See rationale in 5b8738c.
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-03-069-32/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/association_basics.md
| * | | | | | | [ci skip] Update all guides with `null: false` change in migrationsPrathamesh Sonpatki2016-03-033-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We no longer add `null: false` for timestamps columns as per rails/rails@a939506. - Followup of https://github.com/rails/docrails/commit/14867b1a9af813b0147bba2ae06675137d61d77b.
| * | | | | | | [ci skip] Update getting started guide for chanages in migrations APIPrathamesh Sonpatki2016-03-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We no longer add `null: false` for timestamps columns as per https://github.com/rails/rails/commit/a939506f297b667291480f26fa32a373a18ae06a. - Similarly `references` and `belongs_to` columns no longer mention `index: true` in migration files. It's added by default as per https://github.com/rails/rails/commit/909818b93b8f1bd4d7053a1c5d8135b9b0cbe865.
| * | | | | | | [ci skip] fix json outputMikhail Dieterle2016-02-271-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Remove reference to Rails 4 in the initialization guide.Prathamesh Sonpatki2016-02-262-3/+3
| | | | | | | |
| * | | | | | | [ci skip] Fix `'id'` to be fixed-width fontyui-knk2016-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As shown below, we should use <tt>...</tt> for string literal ``` $ echo "+'id'+" | rdoc --pipe <p>+&#39;id&#39;+</p> $ echo "<tt>'id'</tt>" | rdoc --pipe <p><code>&#39;id&#39;</code></p> ```
| * | | | | | | [ci skip] fix typosMikhail Dieterle2016-02-141-3/+3
| | | | | | | |
| * | | | | | | [ci skip] Update 'Testing Active Record'yui-knk2016-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up 8c629bf463b47643712570d4511a68b9a3da1476. `bundle exec rake test` in 'activerecord' runs tests for * sqlite3 * mysql2 * postgresql
* | | | | | | | This code won't workAkira Matsuda2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #24082 from kamipo/fix_typo_sslcipherRafael França2016-03-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo `--ssl-cipher`
| * | | | | | | | Fix typo `--ssl-cipher`Ryuta Kamizono2016-03-061-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #22543.
* | | | | | | | Merge pull request #24081 from y-yagi/remove_entry_for_reverted_commitRafael França2016-03-051-3/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove entry for reverted commit [ci skip]
| * | | | | | | | remove entry for reverted commit [ci skip]yuuji.yaginuma2016-03-061-3/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Follow up to ddf4c953ae8d10489e0bfd6008bd76395f6e1267
* | | | | | | | Merge pull request #24079 from y-yagi/chage_date_time_to_datetimeSean Griffin2016-03-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | chage `date_time` type ` to `datetime`
| * | | | | | | | chage `date_time` type ` to `datetime`yuuji.yaginuma2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are using `datetime` in migration, better to use `datetime` is I think that confusion is less.
* | | | | | | | | Merge pull request #24080 from y-yagi/make_attributes_api_example_to_workRafael França2016-03-051-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | make attributes API example to work [ci skip]
| * | | | | | | | | make attributes API example to work [ci skip]yuuji.yaginuma2016-03-061-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a need to pass the keyword arguments to `attribute` method.
* / / / / / / / / Update the rendering guide to match the current behaviorRafael Mendonça França2016-03-051-10/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the latest security releases render with a trailing slash no more call render :file. Also add a note about the security implications of using it with user parameters.
* | | | | | | | Revert "Merge pull request #22764 from ↵Rafael Mendonça França2016-03-053-44/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stevenspiel/titleize_model_name_for_default_submit_button_value" This reverts commit 4158974c60d817c9bc1e2aecb342161295f2ac0d, reversing changes made to 3d590add45b7ff1de972d99b076cb504d5208935. Reason: This break i18n in some languages. See https://github.com/rails/rails/issues/791#issuecomment-192724640
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 23:28:00 +0000