aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17715 from tgxworld/fix_nil_anchorGodfrey Chan2014-11-223-1/+20
|\ | | | | Anchor should not be appended when set to nil/false.
| * Anchor should not be appended when set to nil/false.Guo Xiang Tan2014-11-233-1/+20
| | | | | | | | Fixes https://github.com/rails/rails/issues/17714.
* | Merge pull request #17722 from yui-knk/fix/callbacks_commentZachary Scott2014-11-221-1/+1
|\ \ | | | | | | [ci skip] Fix comment of ActionDispatch::Callbacks
| * | [ci skip] Fix comment of ActionDispatch::Callbacksyui-knk2014-11-231-1/+1
|/ / | | | | | | cc ddce3dd
* | [ci skip] Dispatching is a verb :bow:Zachary Scott2014-11-221-1/+1
| | | | | | | | cc #17719
* | Merge pull request #17719 from yui-knk/fix/rails_on_rack_guideZachary Scott2014-11-221-1/+1
|\ \ | | | | | | Fix explanation for ActionDispatch::Callbacks. [ci skip]
| * | Fix explanation for ActionDispatch::Callbacks.yui-knk2014-11-231-1/+1
| | | | | | | | | | | | | | | ActionDispatch::Callbacks dose not run the prepare callbacks, so change with comment on ActionDispatch::Callbacks.
* | | Merge pull request #17718 from arthurnn/fixes_16928Zachary Scott2014-11-222-1/+7
|\ \ \ | |/ / |/| | Fixes 16928, improve reflections public API doc [ci skip]
| * | Update reflections public API docArthur Neves2014-11-221-1/+1
| | |
| * | Add changelog entry for .reflections API changeArthur Neves2014-11-221-0/+6
|/ / | | | | | | | | | | | | | | | | | | `.reflections` public API changed to return a String instead of a Symbol as keys. see commit 1f31488499111fdfce79d8dc1cc8fb008f7cdb25 and 6259e4e2dcca9a79f22f96658c33efe81936bc0d [fixes #16928] [fixes #17610]
* | Fix build failuresSean Griffin2014-11-221-1/+3
| | | | | | | | | | | | | | | | | | | | For some reason changing `.find` to `.unscoped.find` in https://github.com/rails/rails/commit/f766abd4cf3eb75469d3646cfb6d85e668c619f3 caused `scoping` to leak in some tests when run in isolation (looks like a concurrency issue?). `relation_scoping_test.rb` is a case that failed. From what I can tell it should not be possible, but changing to the block form fixes it. There is a deeper issue that I can't seem to find. /cc @senny
* | Rename the primary key index when renaming a table in pgSean Griffin2014-11-223-0/+43
| | | | | | | | | | | | | | | | Also checked to make sure this does not affect foreign key constraints. (It doesn't). Fixes #12856 Closes #14088
* | Remove outdated comments [ci skip]Godfrey Chan2014-11-221-6/+0
| | | | | | They were introduced in 23b6def; the serial stuff has been removed since a5d80f8
* | Merge pull request #17716 from javiervidal/fixing_documentationArun Agrawal2014-11-221-1/+1
|\ \ | |/ |/| Fixing wrong link in 'Ruby on Rails Security Guide' [ci skip]
| * Fixing wrong link in 'Ruby on Rails Security Guide' [ci skip]Javier Vidal2014-11-221-1/+1
|/ | | | | | | | | | The URL http://www.h-online.com/security/Symantec-reports-first-active-attack-on-a-DSL-router--/news/102352 points to an article titled 'The H is closing down'. The good one is: http://www.h-online.com/security/news/item/Symantec-reports-first-active-attack-on-a-DSL-router-735883.html
* Merge pull request #17712 from y-yagi/correct_postgres_guideArun Agrawal2014-11-221-2/+2
|\ | | | | [ci skip] correct example output and filename in pg guide
| * [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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 22:15:21 +0000