aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | Mention new CSRF protection gotcha in upgrade guideJeremy Kemper2013-12-171-1/+26
| | | | | | | | | | |
* | | | | | | | | | | Discuss Action Pack's new CSRF protection from remote script tags and what ↵Jeremy Kemper2013-12-171-132/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it means for your app. In short, update your tests if they don't already use the 'xhr :post' style.
* | | | | | | | | | | Fix integration test to pass same-origin verificationJeremy Kemper2013-12-171-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #13345 from jeremy/get-csrfJeremy Kemper2013-12-176-28/+143
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CSRF protection from cross-origin <script> tags
| * | | | | | | | | | | CSRF protection from cross-origin <script> tagsJeremy Kemper2013-12-176-28/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to @homakov for sounding the alarm about JSONP-style data leaking
* | | | | | | | | | | | Merge pull request #13314 from laurocaetano/blacklist_array_methodsJeremy Kemper2013-12-174-30/+59
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a blacklist to disallow mutator methods to be delegated to Array Conflicts: guides/source/upgrading_ruby_on_rails.md
| * | | | | | | | | | | Create a blacklist to disallow mutator methods to be delegated to `Array`.Lauro Caetano2013-12-174-30/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was necessary because the whitelist wouldn't work. It would be painful for users trying to update their applications. This blacklist intent to prevent odd bugs and confusion in code that call mutator methods directely on the `Relation`.
* | | | | | | | | | | | Add changelog entries about secrets.yml and secrets.secret_key_baseGuillermo Iguaran2013-12-171-0/+29
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #13346 from chancancode/release_notes_etcYves Senn2013-12-174-47/+147
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Release notes fixes [ci skip]
| * | | | | | | | | | | | Some assorted fixes for the 4.1 release notes:Godfrey Chan2013-12-174-47/+147
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added release notes for secrets.yml and mentioned it in the highlights * Added release notes for Mailer previews and mentioned it in the highlights * Added release notes for Module#concerning * Removed mention for AV extraction from the highlights * Rearranged the major features to put highlighted features first * Various improvements and typo fixes [ci skip]
* | | | | | | | | | | | Merge pull request #13341 from carlosantoniodasilva/ca-i18nCarlos Antonio da Silva2013-12-1710-14/+94
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default I18n.enforce_available_locales to true We will default this option to true from now on to ensure users properly handle their list of available locales whenever necessary. This option was added as a security measure and thus Rails will follow it defaulting to secure option. Also improve the handling of I18n config options in its railtie, taking the new enforce_available_locales option into account, by setting it as the last one in the process. This ensures no other configuration will trigger a deprecation warning due to that setting.
| * | | | | | | | | | | Require I18n >= 0.6.9Carlos Antonio da Silva2013-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option enforce_available_locales is only available on latest versions, so require the last available one which has the option + other related fixes and should not have backward compatibility issues.
| * | | | | | | | | | | Add changelog and upgrading notice related to I18n enforce_available_locales ↵Carlos Antonio da Silva2013-12-172-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling
| * | | | | | | | | | | Disable available locales checks to avoid warnings running the testsCarlos Antonio da Silva2013-12-175-0/+15
| | | | | | | | | | | |
| * | | | | | | | | | | Default I18n.enforce_available_locales to trueCarlos Antonio da Silva2013-12-172-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will default this option to true from now on to ensure users properly handle their list of available locales whenever necessary. This option was added as a security measure and thus Rails will follow it defaulting to secure option. Also improve the handling of I18n config options in its railtie, taking the new enforce_available_locales option into account, by setting it as the last one in the process. This ensures no other configuration will trigger a deprecation warning due to that setting.
* | | | | | | | | | | | concern doesn't include the module automaticallyRafael Mendonça França2013-12-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge pull request #13343 from akshay-vishnoi/test-casesRafael Mendonça França2013-12-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | test case for #limit added - picking latest value from limit
| * | | | | | | | | | | | test case for #limit added - picking latest value from limitAkshay Vishnoi2013-12-171-0/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | release notes link to fixed versions of the API. [ci skip]Yves Senn2013-12-172-2/+2
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed with @fxn the release notes are a snapshot document. The links going out to the API should represent that exact snapshot. This means we always link to the full final release. For example the 3.2 release notes link to http://api.rubyonrails.org/v3.2.0.
* | | | | | | | | | | | Fix indent on AS changelog [ci skip]Carlos Antonio da Silva2013-12-171-18/+18
| | | | | | | | | | | |
* | | | | | | | | | | | minor doc reword. Upgrade Rails itself not to Rails. [ci skip]Yves Senn2013-12-171-3/+3
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @chancancode