aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Typos. return -> returns. [ci skip]Lauro Caetano2013-12-0316-23/+23
|
* Update contributing_to_ruby_on_rails.mdHarshad Sabne2013-12-011-1/+1
| | | Escape hyphen
* Update security.mdHarshad Sabne2013-11-301-1/+1
| | | Add escape character for correct rendering
* Remove Rdoc formatting from markdown [ci skip]Harshad Sabne2013-11-291-1/+1
| | | Use markdown formatting instead
* Fix on-site markdown rendering [ci skip]Harshad Sabne2013-11-281-1/+1
|
* Underscore in markdown should be escaped with backslash [ci skip]Harshad Sabne2013-11-261-1/+1
| | | In the absence of proper escaping the first link was getting messed up and remaining part of the sentence (2nd link) was not displayed in the rendered markdown on the website though it was displaying correctly in the repository markdown file.
* Globalize has moved to a new repositoryHarshad Sabne2013-11-251-1/+1
| | | From (svenfuchs/globalize3) to (globalize/globalize)
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-2429-183/+203
|\ | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
| * a couple of copy-edits before merging [ci skip]Xavier Noria2013-11-241-3/+2
| |
| * API Documentation Guidelines link correction [ci skip]Harshad Sabne2013-11-231-1/+1
| |
| * Improve reading / style of hashes in AR guideCarlos Antonio da Silva2013-11-191-5/+5
| |
| * Revert last two commits mistakenly changing join/include syntaxCarlos Antonio da Silva2013-11-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- Revert "syntax error joining/including models" This reverts commit ac35f72f30c47298a20a90c8c537db888b463bbb. --- Revert "syntax error joining tables" This reverts commit c365986b48c3e8bc8c7f3fa6a8521616ed5dc138. --- Comments: https://github.com/rails/docrails/commit/c365986b48c3e8bc8c7f3fa6a8521616ed5dc138#commitcomment-4630684
| * syntax error joining/including modelsSergio2013-11-181-2/+2
| | | | | | syntax error joining/including models
| * syntax error joining tablesSergio2013-11-181-5/+5
| | | | | | syntax error joining tables
| * The option is called encode_big_decimal_as_string [ci-skip]Godfrey Chan2013-11-151-1/+1
| |
| * Update action_controller_overview.md [ci skip]Harshad Sabne2013-11-151-1/+1
| | | | | | Code style adherence
| * Fix broken Wikipedia link.Harshad Sabne2013-11-131-1/+1
| |
| * Remove outdated guide on using rack builder w/o rails middlewareAlex Johnson2013-11-131-20/+0
| | | | | | | | [ci skip]
| * Correct guide relating MiddlewareStackProxy with EnumerableAlex Johnson2013-11-131-5/+4
| | | | | | | | | | | | | | | | [ci skip] Enumerable.instance_methods & Rails::Configuration::MiddlewareStackProxy.instance_methods # => [:as_json] MiddlewareStackProxy does not share any notable methods with Enumerable.
| * [ci skip] Replace #=> with # =>Alex Johnson2013-11-123-17/+17
| |
| * Fix RailsServer#start content in initialization guideAlex Johnson2013-11-121-17/+23
| | | | | | | | [ci skip]
| * Change syntax format for example returned valuesPrem Sichanugrist2013-11-1119-107/+107
| | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
| * Add section for command_tasks in initialization guideAlex Johnson2013-11-081-12/+42
| | | | | | | | [ci skip]
| * Update commands.rb content in initialization guideAlex Johnson2013-11-081-2/+8
| | | | | | | | [ci skip]
| * Update README.rdoc [ci skip]Harshad Sabne2013-11-081-1/+1
| | | | | | Highlighted code
* | Merge pull request #13021 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-241-1/+1
|\ \ | | | | | | Updated allow_failures for Rubinius 2.2.1.
| * | Updated allow_failures for Rubinius 2.2.1.Federico Ravasio2013-11-241-1/+1
|/ /
* | Merge pull request #13019 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-242-5/+3
|\ \ | | | | | | Rubinius Gemfile and travis fixes
| * | Properly fix Rubinius dependencies in Gemfile & Travis integration.Federico Ravasio2013-11-242-5/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even if not included in the Gemfile. Now it's 100% required to include the gem 'rubysl', otherwise the stdlib is not available entirely, breaking everything. Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing conflicts with Rails's dependency on minitest 5. That is not the case anymore since rubysl-test-unit 2.0.2, so it is completely safe to include it fully. When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2, thus picking new versions automatically.
* | Merge pull request #13016 from arunagw/test-for-skip-assets-controllerGuillermo Iguaran2013-11-231-0/+6
|\ \ | | | | | | Test for when controller with skip-assets
| * | Test for when controller with skip-assetsArun Agrawal2013-11-231-0/+6
|/ /
* | Merge pull request #13015 from arunagw/task-creation-command-testYves Senn2013-11-231-1/+13
|\ \ | | | | | | Added test when task generator called on revoke
| * | Added test when task generator called on revokeArun Agrawal2013-11-231-1/+13
|/ /
* | Merge pull request #13012 from harrigan/masterYves Senn2013-11-231-1/+1
|\ \ | | | | | | Helper should be a module in Rails guides [ci skip]
| * | Helper should be a module in Rails guides [ci skip]Martin Harrigan2013-11-231-1/+1
|/ /
* | Merge pull request #13011 from arunagw/jruby-fixesYves Senn2013-11-231-2/+10
|\ \ | | | | | | Using activerecord-jdbcsqlite3-adapter
| * | Using activerecord-jdbcsqlite3-adapterArun Agrawal2013-11-231-2/+10
| | | | | | | | | | | | | | | PluginGeneratorTest needs to have activerecord-jdbcsqlite3-adapter to pass under JRuby
* | | Merge pull request #13010 from arunagw/cleanedup-generator-testYves Senn2013-11-231-21/+6
|\ \ \ | |/ / |/| | Cleaned up app generator test
| * | Cleaned up app generator testArun Agrawal2013-11-231-21/+6
|/ /
* | Merge pull request #13007 from chancancode/dont_call_as_json_with_nilJeremy Kemper2013-11-222-2/+18
|\ \ | | | | | | Don't call #as_json on children of Array and Hash with nil when no arguments are passed
| * | When Array#as_json and Hash#as_json are called without options, theyGodfrey Chan2013-11-222-2/+18
| | | | | | | | | | | | | | | should also call #as_json on the children without options (instead of nil)
* | | Merge pull request #12774 from exAspArk/fix_uniqueness_on_relationYves Senn2013-11-223-1/+24
|\ \ \ | |/ / |/| | Fix validation on uniqueness
| * | Fix validation on uniqueness of empty associationEvgeny Li2013-11-223-1/+24
|/ /
* | Use a more generic assertion to make sure this tests will be useful.Rafael Mendonça França2013-11-221-3/+2
| | | | | | | | | | | | Since we are using assert_no_match, if we change the code before changing the tests, the tests will still pass and the assertion will become useless
* | Merge pull request #13003 from laurocaetano/fix_assertion_for_turbolinksRafael Mendonça França2013-11-221-1/+1
|\ \ | | | | | | Fix the assertion for not inclusion of turbolinks on application.js.
| * | Fix the assertion for not inclusion of turbolinks on application.js.Lauro Caetano2013-11-221-1/+1
|/ / | | | | | | | | We were asserting if `//= turbolinks` was not present while the correct is asserting that `//= require turbolinks` is not present.
* | Improve changelogsCarlos Antonio da Silva2013-11-224-11/+13
| | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip]
* | Merge pull request #13000 from arunagw/build-fix-rake-testYves Senn2013-11-211-2/+2
|\ \ | | | | | | Build fix for new routing inspector changes
| * | Build fix for new routing inspector changesArun Agrawal2013-11-221-2/+2
|/ / | | | | | | | | | | Broken by 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
* | Merge pull request #12996 from shreve/patch-2Guillermo Iguaran2013-11-211-1/+1
|\ \ | | | | | | Added a missing close parenthesis to i18n.md
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 22:32:44 +0000