aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-09-184-8/+8
|\
| * s/JQuery/jQuery/Akira Matsuda2015-09-181-1/+1
| | | | | | | | [ci skip]
| * [ci skip] Fix module name of documentyui-knk2015-09-171-1/+1
| |
| * [ci skip] Replace double spaces with single spaceyui-knk2015-09-171-1/+1
| |
| * Add missing and remove unnecessary periods in testing.md [ci skip]Juanito Fatas2015-09-051-5/+5
| |
* | File encoding is defaulted to utf-8 in Ruby >= 2.1Akira Matsuda2015-09-1819-29/+0
| |
* | D HH => D H HAkira Matsuda2015-09-181-1/+1
| |
* | Merge pull request #21660 from amitsuroliya/improve_docsArthur Nogueira Neves2015-09-171-1/+1
|\ \ | | | | | | Correct ArgumentError message in ActiveSupport conversions docs [ci s…
| * | Correct ArgumentError message in ActiveSupport conversions docs [ci skip]amitkumarsuroliya2015-09-181-1/+1
|/ / | | | | This was happened after this commit https://github.com/rails/rails/commit/2ebf47aea21ff8ac10681e53e78dd7a0e5c31c6e
* | Merge pull request #21658 from defektive/patch-1Rafael Mendonça França2015-09-171-1/+1
|\ \ | | | | | | Change AbstractRequest to ActionDispatch::Request
| * | Change AbstractRequest to ActionDispatch::RequestBradley D2015-09-171-1/+1
|/ / | | | | | | | | | | AbstractRequest has been deprecated, updating to refer to ActionDispatch::Request instead. [ci skip]
* | Merge pull request #21562 from betesh/mime_types_in_actionmailerAndrew White2015-09-171-0/+7
|\ \ | | | | | | When used by ActionMailer, ActionView should automatically use the correct MIME type just as it does when used by ActionDispatch
| * | When used by ActionMailer, ActionView should automatically use the correct ↵Isaac Betesh2015-09-091-0/+7
| | | | | | | | | | | | MIME type just as it does when used by ActionDispatch #11157
* | | Merge pull request #21625 from amitsuroliya/improve_docsAndrew White2015-09-171-2/+2
|\ \ \ | | | | | | | | Improve Docs of ActiveSupport::TimeZone [ci skip]
| * | | Improve Docs of ActiveSupport::TimeZone [ci skip]amitkumarsuroliya2015-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | `TimeZone` class is a part of `ActiveSupport` module. For Accessing `TimeZone` class, we need to call `ActiveSupport::TimeZone` instead of `TimeZone`. individual `TimeZone` gives `NameError: uninitialized constant ‘TimeZone’ error
* | | | Merge pull request #20889 from morgoth/fix-mailer-previews-on-not-local-requestsAndrew White2015-09-173-2/+11
|\ \ \ \ | | | | | | | | | | Fix displaying mailer previews on non local requests.
| * | | | Fix displaying mailer previews on non local requests.Wojciech Wnętrzak2015-09-173-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | When config `action_mailer.show_previews` is set, previews are displayed regardless of local request check.
* | | | | Merge pull request #21654 from yui-knk/fix/doc_apiArthur Nogueira Neves2015-09-171-7/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Remove useless "@api public/private"
| * | | | | [ci skip] Remove useless "@api public/private"yui-knk2015-09-171-7/+1
| |/ / / / | | | | | | | | | | | | | | | Other public APIs do not have these annotations.
* | | | | Merge pull request #21651 from shingo-nakanishi/fixed_docsYves Senn2015-09-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed helpers submit button Examples [ci skip]
| * | | | | No need the `a`shingo.nakanishi2015-09-171-2/+2
| | | | | |
| * | | | | Fixed helpers submit button Examples [ci skip]shingo.nakanishi2015-09-171-1/+1
| |/ / / /
* | | | | Merge pull request #21581 from ronakjangir47/restrict_with_errorYves Senn2015-09-175-2/+44
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | `restrict_with_error` message will now respect owner’s human name
| * | | | `restrict_with_error` message will now respect owner’s human name in any ↵Ronak Jangir2015-09-124-2/+39
| | | | | | | | | | | | | | | | | | | | locale [kuboon & Ronak Jangir]
* | | | | Merge pull request #21637 from amitsuroliya/doc_fixesKasper Timm Hansen2015-09-171-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Improved ActiveRecord Connection Pool docs [ci skip]
| * | | | | Improved ActiveRecord Connection Pool docs [ci skip]amitkumarsuroliya2015-09-171-2/+2
| | | | | |
* | | | | | Merge pull request #21566 from ronakjangir47/active_record2Kasper Timm Hansen2015-09-168-58/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed mocha from Active Record Part 2
| * | | | | | Removed mocha from Active Record Part 2Ronak Jangir2015-09-168-58/+85
| | |/ / / / | |/| | | |
* | | | | | s/Github/GitHub/Akira Matsuda2015-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #21646 from ↵Richard Schneeman2015-09-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/no-hardcoded-ignored-lines-in-schema-dumper Don't hardcode table name
| * | | | | | Don't hardcode table nameschneems2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The schema_migrations table name is configurable. We should use this value when checking for ignored table names when dumping schema instead of a hardcoded value.
* | | | | | | Clarify CSRF <script> purpose and protection. Note how to deal with your own ↵Jeremy Daer2015-09-162-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <script> tags. Ref #21618 [ci skip]
* | | | | | | Merge pull request #21644 from AvnerCohen/i18n_backendClaudio B.2015-09-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update documentation to remove 'desirable' suggestion for what is not a clear cut approach
| * | | | | | | Update documentation to remove 'desirable' suggestion for what is not a ↵Avner Cohen2015-09-161-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | clear cut approach
* | | | | | | Merge pull request #21618 from designgrill/masterEileen M. Uchitelle2015-09-162-5/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Improved explanation of the <script> tag CSRF behavior
| * | | | | | Improved explanation of the <script> tag CSRF behaviorAnshul Agrawal2015-09-142-5/+3
| | | | | | |
* | | | | | | Merge pull request #21640 from yahonda/doc_remove_default_nullArthur Nogueira Neves2015-09-151-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Remove `DEFAULT NULL` from examples
| * | | | | | | [ci skip] Remove `DEFAULT NULL` from examplesYasuo Honda2015-09-161-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #21634 from ↵Kasper Timm Hansen2015-09-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JuanitoFatas/feature/fewer-rack-env-direct-manipulate Use rack.session_options instead of directly change env
| * | | | | | | Use rack.session_options instead of directly change envJuanito Fatas2015-09-161-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #21623 from schneems/schneems/schema-migration-docsRichard Schneeman2015-09-151-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Doc SchemaMigration class.
| * | | | | | | Doc SchemaMigration class.schneems2015-09-141-1/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | fewer direct env manipulationsAaron Patterson2015-09-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this commit removes some direct access to `env`.
* | | | | | | allocate request objects with the env hash, set routes on the requestAaron Patterson2015-09-152-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is to abstract the code away from the env hash. It no longer needs to have the routes key hard coded.
* | | | | | | Merge pull request #21606 from Eric-Guo/masterRafael Mendonça França2015-09-151-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bundler tzinfo-data in windows, even first generated new app are Mac
| * | | | | | | Bundler tzinfo-data in windows, even first generated new app are MacEric Guo2015-09-151-2/+0
| | | | | | | |
* | | | | | | | Merge pull request #20848 from ↵Arthur Nogueira Neves2015-09-141-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | deivid-rodriguez/fix_undefined_method_error_on_exception Fix undefined method error on exception
| * | | | | | | Fix undefined method error on exceptionDavid Rodríguez2015-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `error` method is not defined, in general, for exceptions. Instead, print the exception message. This error was hiding actual meaningful DB configuration errors. See http://stackoverflow.com/questions/18774463.
* | | | | | | | Merge pull request #20897 from lukechesser/guide-fix-for-acceptance-validationArthur Nogueira Neves2015-09-141-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update Validation guide for acceptance method
| * | | | | | | | Update validation guide for acceptance methodLuke Chesser2015-07-161-3/+7
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 19:34:03 +0000