aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | 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
| * | | | | | | | | | | | Fix to_param when attribute has multibyte characterrono232013-12-192-2/+10
| | | | | | | | | | | | |
* | | | | | | | | | | | | make clear that config/secrets.yml passes through ERB and therefore supports ENVXavier Noria2013-12-181-0/+6
|/ / / / / / / / / / / /
* | | | | | | | | | | | Always point to latest rbx and jruby in travisSantiago Pastorino2013-12-181-4/+4
| | | | | | | | | | | |
* | | | | | | | | | | | document how to access mail previews. [ci skip]Yves Senn2013-12-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @pixeltrix
* | | | | | | | | | | | Fix nil assignment to polymorphic belongs_toJeremy Kemper2013-12-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning nil to a polymorphic belongs_to would nullify its _id field by not its _type field. Fixes failing test from c141dfc838a5dca9f197814410fa5d44c143129c. Regression from 1678e959e973de32287b65c52ebc6cce87148951.
* | | | | | | | | | | | Merge pull request #13370 from abhishekjain16/refactor_railsYves Senn2013-12-181-16/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | duplication removed(DRY)
| * | | | | | | | | | | | duplication removed(DRY)abhishek2013-12-181-16/+10
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #13373 from sbagdat/patch-1Damien Mathieu2013-12-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo [ci skip]
| * | | | | | | | | | | | | Fix typo [ci skip]Sıtkı Bağdat2013-12-181-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Added a link to the Module#concerning docs from the 4.1 release notes [ci skip]Godfrey Chan2013-12-181-4/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #13367 from abhishekjain16/new_branchYves Senn2013-12-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change to DateTime.civil_from_format from DateTime.civil_from_fromat in ... [ci skip]
| * | | | | | | | | | | | change to DateTime.civil_from_format from DateTime.civil_from_fromat in ↵abhishek2013-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changelog [ci skip]
* | | | | | | | | | | | | Merge pull request #13340 from akshay-vishnoi/typoGodfrey Chan2013-12-181-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | #none documentation updated [ci skip]
| * | | | | | | | | | | | | #none documentation updated [ci skip]Akshay Vishnoi2013-12-181-5/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Use annotated git tags for release taskJeremy Kemper2013-12-182-2/+2
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | we should use annotated tags for releases.Yves Senn2013-12-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotated tags will provide us with Tagger and Time information.
* | | | | | | | | | | | | Merge pull request #13363 from kuldeepaggarwal/f-video-optionsGuillermo Iguaran2013-12-172-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow video_tag to accept `size` as `Number` for square shaped videos
| * | | | | | | | | | | | | allow video_tag to accept `size` as `Number` for square shaped videosKuldeep Aggarwal2013-12-182-5/+11
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #13364 from corprew/patch-1Arun Agrawal2013-12-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | typo: should be 'DateTime.civil_from_format' and not 'DateTime.civil_from_fromat'
| * | | | | | | | | | | | | typo: should be 'DateTime.civil_from_format' and not ↵Corprew Reed2013-12-171-1/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'DateTime.civil_from_fromat'
* | | | | | | | | | | | | Add a failing test for assigning nil to a polymorphic belongs_to not ↵Jeremy Kemper2013-12-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nullifying its _type column
* | | | | | | | | | | | | Merge pull request #13358 from JuanitoFatas/patch/release-notesCarlos Antonio da Silva2013-12-171-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Prettify the removals from Action Controller in 4.1 release notes. [ci skip]
| * | | | | | | | | | | | [ci skip] Prettify the removals from Action Controller in 4.1 release notes.Juanito Fatas2013-12-181-7/+9
|/ / / / / / / / / / / /
* | | | | | | | | | | | Its beta1 all aroundDavid Heinemeier Hansson2013-12-172-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Fix dependency orderDavid Heinemeier Hansson2013-12-171-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-177-7/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Remove the navigator for now. Its ugly and it promises more than it can ↵David Heinemeier Hansson2013-12-171-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deliver. These other views (properties, routes) are not designed to be loaded in isolation
* | | | | | | | | | | | Clearly limit new CSRF protection to GET requestsJeremy Kemper2013-12-172-2/+17
| | | | | | | | | | | |