aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] correct example output and filename in pg guideyuuji.yaginuma2014-11-221-2/+2
|
* ConnectionAdapter#substitute_at is technically public API...Sean Griffin2014-11-211-1/+1
| | | | We can't change the signature without a deprecation cycle.
* Merge pull request #17705 from fgo/patch-14Arthur Nogueira Neves2014-11-211-2/+2
|\ | | | | Move 'the' outside of SQLite and Bundler link text [ci skip]
| * Move 'the' outside of SQLite and Bundler link text [ci skip]Francis Go2014-11-221-2/+2
| |
* | Merge pull request #17702 from tgxworld/fix_select_tag_include_blank_falseSantiago Pastorino2014-11-212-1/+9
|\ \ | | | | | | Fix select_tag generating tag when set to false.
| * | Fix select_tag generating tag when set to false.Guo Xiang Tan2014-11-212-1/+9
| | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/17701.
* | | make it possible to access fixtures excluded by a `default_scope`.Yves Senn2014-11-214-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch you'd end up with an error like: ``` ActiveRecord::RecordNotFound: Couldn't find <Model> with 'id'=<id> [WHERE (<default_scope condition>)] ```
* | | Merge pull request #17704 from fgo/patch-13Abdelkader Boudih2014-11-211-2/+2
|\ \ \ | |_|/ |/| | Update grammar in Getting Started Guide [ci skip]
| * | Update grammar in Getting Started Guide [ci skip]Francis Go2014-11-211-2/+2
|/ /
* | Merge pull request #17695 from claudiob/replace-all-backticks-with-plusesYves Senn2014-11-217-12/+12
|\ \ | |/ |/| Wrap code snippets in +, not backticks, in sdoc [ci skip]
| * Wrap code snippets in +, not backticks, in sdocclaudiob2014-11-207-12/+12
| | | | | | | | | | | | | | | | I grepped the source code for code snippets wrapped in backticks in the comments and replaced the backticks with plus signs so they are correctly displayed in the Rails documentation. [ci skip]
* | ignore all logfiles but keep the log directory. #17700 [ci skip]Yves Senn2014-11-211-1/+2
| | | | | | | | | | | | | | | | We generate a `.keep` file inside the log directory to make sure the directory itself is under version control. let's keep it that way. /cc @matthewd
* | Merge pull request #17700 from ShunsukeAida/ignore_log_as_a_wholeYves Senn2014-11-212-1/+6
|\ \ | | | | | | | | | | | | | | | why not gitignore /log as a whole? [ci skip]
| * | if you want to ignore all the logfiles, no need for extensionsShunsuke Aida2014-11-211-1/+1
| |/
* / raise a better exception for renaming long indexesAaron Patterson2014-11-203-0/+20
|/
* Merge pull request #17694 from claudiob/remove-backticks-from-sdocXavier Noria2014-11-201-3/+3
|\ | | | | Wrap code snippets in +, not backticks, in sdoc [ci skip]
| * Wrap code snippets in +, not backticks, in sdocclaudiob2014-11-201-3/+3
|/ | | | [ci skip]
* Merge pull request #17688 from ilyakatz/request_method_instrumentationRafael Mendonça França2014-11-201-1/+1
|\ | | | | Use request_method instead of method in instrumentation
| * Use request method instead of ActionDispatch::Request#request_method instead ↵Ilya Katz2014-11-201-1/+1
| | | | | | | | of ActionDispatch::Request#method to pick up overrides by the middleware
* | Merge pull request #17685 from claudiob/document-form-for-extra-optionsRafael Mendonça França2014-11-201-0/+15
|\ \ | | | | | | | | | | | | | | | | | | Document *all* the options accepted by form_for Conflicts: actionview/lib/action_view/helpers/form_helper.rb
| * | Document *all* the options accepted by form_forclaudiob2014-11-201-0/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [current documentation of form_for](http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-form_for) is incomplete: > The rightmost argument to form_for is an optional hash of options - > :url - The URL the form is to be submitted to. This may be represented in the same way as values passed to url_for or link_to. So for example you may use a named route directly. When the model is represented by a string or symbol, as in the example above, if the :url option is not specified, by default the form will be sent back to the current url (We will describe below an alternative resource-oriented usage of form_for in which the URL does not need to be specified explicitly). > :namespace - A namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generated HTML id. > :html - Optional HTML attributes for the form tag. This commit completes the documentation by specifying that: * `:authenticity_token` is also a valid option (as [documented here](https://github.com/rails/rails/blob/b0f44c9ff0be84ebc42760029adeeb9dd954655f/actionview/lib/action_view/helpers/form_helper.rb#L396)) * `:method` is also a valid option (as [tested here](https://github.com/rails/rails/blob/b0f44c9ff0be84ebc42760029adeeb9dd954655f/actionview/test/template/form_helper_test.rb#L1819)) * `:remote` is also a valid option (as [tested here](https://github.com/rails/rails/blob/b0f44c9ff0be84ebc42760029adeeb9dd954655f/actionview/test/template/form_helper_test.rb#L1850)) [ci skip]
* | Merge pull request #17692 from robertomiranda/patch-1Rafael Mendonça França2014-11-201-5/+0
|\ \ | | | | | | _will_change! method is not needed any more [ci skip]
| * | _will_change! method is not needed any more [ci skip]Roberto Miranda2014-11-201-5/+0
| |/ | | | | ref #15674
* | Merge pull request #17690 from claudiob/add-enforce-utf8-to-form-forRafael Mendonça França2014-11-203-3/+43
|\ \ | |/ |/| Add `:enforce_utf8` option to form_for
| * Add `:enforce_utf8` option to form_forclaudiob2014-11-203-3/+43
|/ | | | | | | | | Since 06388b0 `form_tag` accepts the option `enforce_utf8` which, when set to false, prevents the hidden "UTF8 enforcer" field from appearing in the output. This commit implements the same behavior for `form_for`. Stems from https://github.com/rails/rails/pull/17685#issuecomment-63871395
* Merge pull request #17683 from tgxworld/improvements_to_active_job_guideRafael Mendonça França2014-11-201-10/+12
|\ | | | | [CI SKIP] Improvements to Active Job guide.
| * [CI SKIP] Improvements to Active Job guide.Guo Xiang Tan2014-11-201-10/+12
| |
* | Merge pull request #17669 from SamSaffron/optimise_memorySean Griffin2014-11-201-1/+6
|\ \ | | | | | | PERF: avoid string allocations
| * | PERF: avoid string allocationsSam2014-11-201-1/+6
| | |
* | | synchronize code and docs for `timestamps` and `add_timestamps`.Yves Senn2014-11-206-10/+22
| |/ |/| | | | | | | | | | | | | This makes the following changes: * warn if `:null` is not passed to `add_timestamps` * `timestamps` method docs link to `add_timestamps` docs * explain where additional options go * adjust examples to include `null: false` (to prevent deprecation warnings)
* | Some valid block calls in templates caused syntax errorsAkira Matsuda2014-11-203-2/+7
| | | | | | | | Now ActionView accepts <%= foo(){ %> and <%= foo()do %> :golf:
* | Merge pull request #17575 from shikshachauhan/make-habtm-consistentRafael Mendonça França2014-11-192-1/+11
|\ \ | | | | | | Allow class_name option in habtm to be consistent with other association...
| * | Allow habtm class_name option to be consistent with other associationsshiksha2014-11-132-1/+11
| | |
* | | Fix shell quote on the release taskRafael Mendonça França2014-11-191-1/+1
| | |
* | | Reintroduce cache with testsSean Griffin2014-11-193-14/+56
| | |
* | | Add tests for `TypeMap#fetch` and push up to `TypeMap`Sean Griffin2014-11-193-5/+20
| | | | | | | | | | | | | | | | | | | | | It doesn't make sense for the subclass to implement this method, and not have it on the parent. We can also DRY up the implementation of `#lookup` to be defined in terms of fetch, which will give us a single point of entry
* | | Merge pull request #17677 from StevenNunez/patch-1Rafael Mendonça França2014-11-191-1/+0
|\ \ \ | | | | | | | | Remove bullet point to unwritten/unreferenced section
| * | | Remove bullet point to unwritten/unreferenced sectionSteven Nunez2014-11-191-1/+0
|/ / /
* | | That last test was incorrect... ☕Sean Griffin2014-11-191-10/+0
| | |
* | | Revert "PERF: optimise type lookup to avoid invoking procs"Sean Griffin2014-11-192-32/+8
| | | | | | | | | | | | This reverts commit da99a2a2982d35f670ad9647463e09bfe9032b70.
* | | Introduce test to demonstrate regression caused by da99a2a2Sean Griffin2014-11-191-0/+10
| | |
* | | Merge pull request #17662 from ↵Rafael Mendonça França2014-11-192-1/+9
|\ \ \ | | | | | | | | | | | | | | | | dtaniwaki/support-symbol-foreign-key-column-to-delete Support symbol foreign key to delete
| * | | Support symbol foreign key to deletedtaniwaki2014-11-192-1/+9
| | | |
* | | | Merge pull request #17672 from radar/date-select-spaceRafael Mendonça França2014-11-191-1/+1
|\ \ \ \ | | | | | | | | | | Add space in :start_year description for date_select
| * | | | Add space in :start_year description for date_selectRyan Bigg2014-11-191-1/+1
|/ / / /
* | | | Duplicated Hash key :promptAkira Matsuda2014-11-191-1/+1
| | | |
* | | | Improve the performance of reading attributesSean Griffin2014-11-1812-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We added a comparison to "id", and call to `self.class.primary_key` a *lot*. We also have performance hits from `&block` all over the place. We skip the check in a new method, in order to avoid breaking the behavior of `read_attribute`
* | | | pull the preloader allocation in to a factory methodAaron Patterson2014-11-181-1/+5
| | | |
* | | | Speed up integer casting from DBSean Griffin2014-11-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have the check the range when the value is coming from the DB, so override type_cast_from_database to short-circuit the extra work. The difference is huge but the absolute gain is quite small. That being said this is a hotspot and it showed up on the radar when benchmarking discourse.
* | | | Make sure assert_select can assert body tagRafael Mendonça França2014-11-186-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f93df52845766216f0fe36a4586f8abad505cac4, reversing changes made to a455e3f4e9dbfb9630d47878e1239bc424fb7d13. Conflicts: actionpack/lib/action_controller/test_case.rb actionview/lib/action_view/test_case.rb