aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17744 from RichardLitt/doc-fix-syntaxRafael Mendonça França2014-11-241-1/+1
|\ | | | | Fix wrong path in comments about stylesheets
| * Fix wrong path in comments about stylesheetsRichard Littauer2014-11-241-1/+1
| | | | | | | | I put the wrong path in my last PR by accident. Fixed here. Related to #17742
* | Merge pull request #17742 from RichardLitt/doc-fix-syntaxRafael Mendonça França2014-11-244-4/+4
|\| | | | | Change 'of plugins' syntax
| * Change 'of plugins' syntaxRichard Littauer2014-11-244-4/+4
|/ | | | | | Currently, the docs uses a syntax that is unclear and not general American English. I've switched it to be clearer wording. Not a big fix, but may be helpful.
* cleanup, remove trailing whitespace [ci skip]Yves Senn2014-11-241-2/+2
|
* Grammar pass on Web Console release note [ci skip]Zachary Scott2014-11-231-3/+3
|
* Clarify what is being serialized and when it will be deserializedZachary Scott2014-11-231-2/+2
| | | | [ci skip]
* Merge pull request #17721 from yui-knk/fix/rails_on_rack_guideZachary Scott2014-11-231-1/+1
|\ | | | | [ci skip] Fix class name of middleware.
| * [ci skip] Fix class name of middleware.yui-knk2014-11-231-1/+1
| |
* | Merge pull request #17732 from rails/add-reflections-string-keys-testGuillermo Iguaran2014-11-231-0/+4
|\ \ | | | | | | Add a test for reflection keys as Strings, fixes #16928
| * | Add a test for reflection keys as Strings, fixes #16928Zachary Scott2014-11-231-0/+4
|/ / | | | | | | See also PR: #17610
* | Merge pull request #17723 from marocu/patch-1Arthur Nogueira Neves2014-11-231-1/+1
|\ \ | | | | | | Specified beta branch for web-console gem
| * | Specified beta branch for web-console gemMatthew Cullum2014-11-221-1/+1
| | |
* | | Correct example in the engines testing guide [ci skip]Godfrey Chan2014-11-231-14/+25
| | | | | | | | | | | | Reference #17453
* | | Test using `ActionController::TestCase` with enginesGodfrey Chan2014-11-231-0/+52
| | | | | | | | | | | | | | | | | | Reference #17453 [Godfrey Chan, Washington Luiz]
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 13:41:39 +0000