aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix few typos and improve markup at some levelsRobin Dupret2013-12-244-5/+5
|
* [ci skip] trailing documentation whitespaceschneems2013-12-191-10/+10
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-2021-28/+30
|\
| * Revert "Update contributing_to_ruby_on_rails.md"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | This reverts commit 41ba51f4850a8cd2fe69789011ac33366366d32f. [ci skip]
| * Revert "Update security.md"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | This reverts commit f4804fafecdc057988575b4516afe9ca1d5f42fc. [ci skip]
| * Revert "Fix on-site markdown rendering [ci skip]"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | This reverts commit 427db6b9d2b35a72f3c017eb19a2e1e800b0a7a3. [ci skip]
| * Revert "Underscore in markdown should be escaped with backslash [ci skip]"Vijay Dev2013-12-191-1/+1
| | | | | | | | | | | | | | | | This reverts commit b58f3a641795e1777aa3e12a853c34ff512acfb9. Reason: Discussion in https://github.com/rails/docrails/commit/b58f3a641795e1777aa3e12a853c34ff512acfb9 [ci skip]
| * [ci skip] add `assets.raise_runtime_errors` flagschneems2013-12-141-2/+4
| | | | | | | | | | The flag will be used in multiple places to check for errors during runtime if enabled. Source: https://github.com/rails/sprockets-rails/pull/100
| * Merge branch 'master' of github.com:rails/docrailsKuldeep Aggarwal2013-12-101-1/+1
| |\
| | * Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-12-10588-6771/+10534
| | |\
| | * \ Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-09-01301-2671/+3921
| | |\ \
| | * | | fixed a typoaditya-kapoor2013-08-201-1/+1
| | | | |
| * | | | fixed typo mistake time_formats.rb -> date_formats.rb [ci skip]Kuldeep Aggarwal2013-12-101-1/+1
| | |_|/ | |/| |
| * | | Remove an extra periodRobin Dupret2013-12-041-1/+1
| | | | | | | | | | | | | | | | As a side not, the period after etc is not always needed http://en.wiktionary.org/wiki/etc
| * | | 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)
* | | | couple of tweaks to the release notes [ci skip]Xavier Noria2013-12-191-2/+2
| | | |
* | | | pass over half of the release notes [ci skip]Xavier Noria2013-12-191-36/+38
| | | |
* | | | Merge pull request #13406 from hincupetru/masterRafael Mendonça França2013-12-192-1/+7
|\ \ \ \ | | | | | | | | | | Fixed configurable.rb regular expression name check
| * | | | Fixed configurable.rb regular expression name checkHincu Petru2013-12-192-1/+7
| | | | |
* | | | | Fix assertions for testing unknown formats using Mime::NullTypeCarlos Antonio da Silva2013-12-191-5/+5
| | | | |
* | | | | Merge pull request #13404 from JuanitoFatas/remove-ttRafael Mendonça França2013-12-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Remove <tt> tag in 4_1_release notes.
| * | | | | [ci skip] Remove <tt> tag in 4_1_release notes.Juanito Fatas2013-12-191-2/+2
|/ / / / /
* | | | | Merge pull request #13401 from akshay-vishnoi/refactorRafael Mendonça França2013-12-192-9/+13
|\ \ \ \ \ | |/ / / / |/| | | | Prevent creation of instance methods when `instance_reader = false`, Grammar checks, Conditional statements combined
| * | | | Prevent creation of instance methods when `instance_reader = false`, Grammar ↵Akshay Vishnoi2013-12-192-9/+13
| | | | | | | | | | | | | | | | | | | | checks, Conditional statements combined
* | | | | Merge pull request #13395 from kuldeepaggarwal/postgres-table-ref-regexCarlos Antonio da Silva2013-12-193-1/+28
|\ \ \ \ \ | | | | | | | | | | | | modified regex for finding table_name from a multiline sql query in postgresql
| * | | | | Fix PostgreSQL insert to properly extract table name from multiline string SQL.Kuldeep Aggarwal2013-12-193-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, executing an insert SQL in PostgreSQL with a command like this: insert into articles( number) values( 5152 ) would not work because the adapter was unable to extract the correct articles table name.
* | | | | | Show routes defined under assets prefixRyunosuke SATO2013-12-193-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Closes #9625
* | | | | | Prefer assert_raise instead of flunk + rescue to test for exceptionsCarlos Antonio da Silva2013-12-1911-84/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change most tests to make use of assert_raise returning the raised exception rather than relying on a combination of flunk + rescue to check for exception types/messages.
* | | | | | Fix asserting the correct exception message in dependencies testCarlos Antonio da Silva2013-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Minitest, the second argument of assert_raise(s) accepts a string as the message that should be shown in case of a failure in the assertion (eg nothing was raised when it should), and not the exception message to be matched. To do that we need to save the exception returned from assert_raise(s) into a local variable and check for the exception message using it.
* | | | | | Update configuring guide with I18n options regarding available localesJared Beck2013-12-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about 'available_locales' and 'enforce_available_locales' to the configuring guide. Closes #13202. [ci skip]
* | | | | | Merge pull request #13393 from matthewd/fix_pg_range_testsCarlos Antonio da Silva2013-12-191-11/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PostgreSQL range tests on fresh DB Correcting the name of the table we're creating is self-explanatory. But we must also move away from the low IDs, because we're not touching the freshly-created primary key sequence; when the time comes, @new_range will be assigned an ID of 1.
| * | | | | | Fix PostgreSQL range testsMatthew Draper2013-12-191-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in c4044b2 meant the tests would error on a fresh DB.
* | | | | | | Unused classes in AMo testsAkira Matsuda2013-12-191-11/+0
| |_|/ / / / |/| | | | |
* | | | | | Unused classes in AS testsAkira Matsuda2013-12-194-30/+0
| | | | | |
* | | | | | Merge pull request #13400 from nishant-cyro/docsGuillermo Iguaran2013-12-182-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typos and grammar mistake [ci skip]
| * | | | | | fix typos and grammar mistake [ci skip]nishant-cyro2013-12-192-2/+2
| | | | | | |
* | | | | | | Merge pull request #13398 from kuldeepaggarwal/build-fixesGuillermo Iguaran2013-12-181-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | set encoding UTF-8 for accepting multibyte character
| * | | | | | | set encoding UTF-8 for accepting multibyte characterKuldeep Aggarwal2013-12-191-0/+2
| | | | | | | |
* | | | | | | | Merge pull request #13399 from ghiculescu/patch-1Guillermo Iguaran2013-12-181-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix typo: data --> date [ci-skip]
| * | | | | | | Fix typo: data --> dateAlex Ghiculescu2013-12-191-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #13366 from vipulnsward/minitest-namespace-changeGodfrey Chan2013-12-1810-18/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Change all `MiniTest` to `Minitest`
| * | | | | | Change all `MiniTest` to `Minitest` since, `MiniTest` namespace has been ↵Vipul A M2013-12-1810-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renamed to `Minitest` Ref: https://github.com/seattlerb/minitest/blob/master/History.txt
* | | | | | | Unused classes in test caseAkira Matsuda2013-12-191-25/+0
| | | | | | |
* | | | | | | Merge pull request #13386 from rono23/fix-to-paramRafael Mendonça França2013-12-182-2/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix to_param when attribute has multibyte character