aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsZachary Scott2015-04-123-31/+3
|\
| * Revert "Merge pull request #19682 from ↵Santiago Pastorino2015-04-123-31/+3
| | | | | | | | | | | | | | supercaracal/fix_force_ssl_redirection_flash_error" This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
* | Add note wrt foreign key constraint to ensure data integrityZachary Scott2015-04-121-0/+10
|/ | | | | | Thanks for patch @sgrif :trollface: Closes #18216
* Apply edits from @senny to close #19397 [ci skip]Zachary Scott2015-04-121-4/+1
|
* Apply comments from @rafaelfranca: we shouldn't recommend you use scaffold cssZachary Scott2015-04-121-9/+0
| | | | Closes #19492 and fixes #19453
* Merge branch 'patch-1'Zachary Scott2015-04-121-3/+5
|\
| * Enhance documentation of pluck with a hint to ids [ci skip]wingfire2015-04-121-3/+5
| | | | | | | | | | Documentation is giving an example that can be replaced by a more dry command. Give a hint that ids can be used instead of pluck(:id).
* | Merge pull request #19564 from jonatack/counter_cache_docsZachary Scott2015-04-121-3/+11
|\ \ | | | | | | [skip ci] Fix counter_cache in the Rails Guides
| * | [skip ci] Fix counter_cache in the Rails GuidesJon Atack2015-03-281-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the AR Associations Guide, this PR fixes: - The counter_cache declaration is now shown only in the `belongs_to` association. - The docs stated that the counter_cache declaration needs to be on the `has_many` side; now corrected to the `belongs_to` side. - Split the custom column explanation out to a separate paragraph. - Simplify the NOTE because it is true both with and without a custom column name.
* | | Fix (intermittent?) test failureMatthew Draper2015-04-131-1/+1
| | | | | | | | | | | | | | | | | | We don't actually need to enumerate the possible types here any more; that dates back to before e105e599e706780905d4c348394da989de3b200f, when they were symbols, and indistinguishable from other options.
* | | Merge pull request #19738 from ojab/squishXavier Noria2015-04-121-2/+1
|\ \ \ | | | | | | | | Speedup String#squish
| * | | Speedup String#squishojab2015-04-121-2/+1
| | | |
* | | | Merge branch 'nishantmodak-view_paths'Zachary Scott2015-04-121-1/+33
|\ \ \ \
| * | | | Some copy edits for modifying View Paths [ci skip]Zachary Scott2015-04-121-5/+21
| | | | |
| * | | | Merge branch 'view_paths' of https://github.com/nishantmodak/rails into ↵Zachary Scott2015-04-121-1/+17
|/| | | | | | | | | | | | | | | | | | | nishantmodak-view_paths
| * | | | view paths docs [ci skip]Nishant Modak2015-04-131-1/+17
| | | | |
* | | | | Merge branch 'mfazekas-action-mailer-async-doc-fixes'Zachary Scott2015-04-121-8/+11
|\ \ \ \ \
| * | | | | Since the delegator wasn't identified earlier, we should here [ci skip]Zachary Scott2015-04-121-2/+2
| | | | | |
| * | | | | Merge branch 'action-mailer-async-doc-fixes' of ↵Zachary Scott2015-04-121-8/+11
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mfazekas/rails into mfazekas-action-mailer-async-doc-fixes Conflicts: actionmailer/lib/action_mailer/base.rb
| * | | | | Fixes to inaccurate documentation in action_mailer [ci skip]Miklos Fazkeas2014-12-181-8/+11
| | | | | |
* | | | | | :scissors:Zachary Scott2015-04-121-2/+2
| |_|/ / / |/| | | |
* | | | | Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessageGodfrey Chan2015-04-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Error message no longer tells you to set the (deprecated) secret_token.
| * | | | | Error message no longer tells you to set the (deprecated) secret_token.Dan2015-04-121-1/+1
|/ / / / /
* | | | | Merge pull request #19732 from wazery/patch-2Kasper Timm Hansen2015-04-121-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Update contributing guide
| * | | | | [ci skip] Update contributing guideIslam Wazery2015-04-121-2/+2
| | | | | |
* | | | | | Fix a few typos and wrap some lines [ci skip]Robin Dupret2015-04-122-12/+21
| | | | | |
* | | | | | Merge pull request #19734 from y-yagi/action_view_guideYves Senn2015-04-121-26/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove reference to `register_javascript_expansion` and `register_stylesheet_expansion` from guide [ci skip]
| * | | | | | remove reference to `register_javascript_expansion` and ↵yuuji.yaginuma2015-04-121-26/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `register_stylesheet_expansion` from guide [ci skip] These methods no longer exists.
* | | | | | Merge pull request #19733 from yuki24/speed-up-levenshteinRichard Schneeman2015-04-112-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Speed up Levenshtein by 50% and reduce 97% of memory usage
| * | | | | | Speed up Levenshtein by 50% and reduce 97% of memory usageYuki Nishijima2015-04-112-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculating ------------------------------------- each_char 924.000 i/100ms each_codepoint 1.381k i/100ms ------------------------------------------------- each_char 9.320k (¡Þ 5.1%) i/s - 47.124k each_codepoint 13.857k (¡Þ 3.6%) i/s - 70.431k Comparison: each_codepoint: 13857.4 i/s each_char: 9319.5 i/s - 1.49x slower The full report can be found here: https://gist.github.com/yuki24/a80988f35aceac76f1d5
* | | | | | | Merge pull request #19566 from aditya-kapoor/remove-dup-docRichard Schneeman2015-04-111-22/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip] remove duplicate doc for current_page?
| * | | | | | [ci skip] remove duplicate doc for current_page?Aditya Kapoor2015-04-091-22/+10
| | |_|_|/ / | |/| | | |
* | | | | | Remove mention of super old defined_javascript_functions method [ci skip]Carlos Antonio da Silva2015-04-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | It was removed long ago: e358b1fce8fdcbac896dde08286be020420e843e.
* | | | | | Merge pull request #19721 from vngrs/validates_presence_of_missing_noteRobin Dupret2015-04-111-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Missing note on validates_presence_of validation [ci skip]
| * | | | | | Missing note on validates_presence_of validation [ci skip]Mehmet Emin İNAÇ2015-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this note, someone can misunderstand the usage of validates_presence_of method add missing note for the validates_presence_of
* | | | | | | Merge pull request #19731 from wazery/rename_bin_to_exeMatthew Draper2015-04-126-6/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Rename railties/bin to railties/exe to match the new Bundler convention
| * | | | | | Rename railties/bin to railties/exeIslam Wazery2015-04-116-6/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That will match the new Bundler executables convention. Bundler Blog Post: http://bundler.io/blog/2015/03/20/moving-bins-to-exe.html Also updated the necessary tests.
* | | | | | Merge pull request #19727 from supercaracal/fix_wrong_test_method_nameEileen M. Uchitelle2015-04-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix a wrong feature test method name
| * | | | | | fix a wrong feature test method nameTaishi Kasuga2015-04-111-1/+1
| | | | | | |
* | | | | | | [ci skip] Remove `link_to_function` and `button_from_function` from guideseileencodes2015-04-111-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods were removed in cb9f7f4 and are no longer methods in the Rails codebase.
* | | | | | | Merge pull request #19728 from jonatack/patch-4Kasper Timm Hansen2015-04-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [skip ci] primay_key -> primary_key
| * | | | | | [skip ci] primay_key -> primary_keyJon Atack2015-04-111-1/+1
|/ / / / / /
* | | | | | Merge branch 'girishso-belongs_to_primary_key_doc'Zachary Scott2015-04-101-0/+20
|\ \ \ \ \ \
| * | | | | | Copy edits for primary_key documentation in association guide. [ci skip]Zachary Scott2015-04-101-3/+4
| | | | | | |
| * | | | | | Merge branch 'belongs_to_primary_key_doc' of ↵Zachary Scott2015-04-101-0/+19
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/girishso/rails into girishso-belongs_to_primary_key_doc
| * | | | | | added primary_key option documentation for belongs_to associationGirish S2014-09-231-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes issue #16698
* | | | | | | Merge pull request #17512 from ↵Zachary Scott2015-04-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JackDanger/danger/use-default-view-pattern-in-docs [docs] Using the real resolver pattern in docs
| * | | | | | | Using the real resolver pattern in docsJack Danger Canty2014-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If someone copies the docs into their app they'll find it simply doesn't work because the locale pattern doesn't have the same logic. This makes the doc examples work exactly as written. [ci skip]
* | | | | | | | Copy edits for QueueAdapters docs to fix #17765 [ci skip]Zachary Scott2015-04-101-18/+18
| | | | | | | |
* | | | | | | | Merge branch 'queue-adapters-docs' of https://github.com/KingsleyKelly/rails ↵Zachary Scott2015-04-101-0/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into queue-adapter-docs
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 18:17:17 +0000