aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Synced Active Model changelogs [ci skip]Godfrey Chan2014-08-191-4/+16
* | | | | | Use web-console 2.0.0.beta2 on new appsGuillermo Iguaran2014-08-191-1/+1
* | | | | | Require sprockets-rails 3.0.0.beta1Rafael Mendonça França2014-08-192-2/+1
* | | | | | Revert "Improve custom configuration"Rafael Mendonça França2014-08-198-145/+46
* | | | | | Require rack/utilsRafael Mendonça França2014-08-191-0/+2
* | | | | | Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelogGuillermo Iguaran2014-08-192-0/+10
|\ \ \ \ \ \
| * | | | | | Mention web-console in 4.2 release notesGenadi Samokovarov2014-08-202-0/+10
* | | | | | | Merge pull request #16475 from tomkadwill/has_many_scope_documentationZachary Scott2014-08-191-0/+11
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Added documentation for belongs_to scope parameterTom Kadwill2014-08-191-0/+11
* | | | | | | | We always get the value so no need to check nil or HashRafael Mendonça França2014-08-191-6/+2
* | | | | | | | Move date and time requires to time_travel_test, also includeZachary Scott2014-08-192-2/+4
* | | | | | | | Add TODO note about the gems missing releaseRafael Mendonça França2014-08-191-1/+3
* | | | | | | | Remove git dependeciesRafael Mendonça França2014-08-191-2/+0
* | | | | | | | Use released rails-html-sanitizerRafael Mendonça França2014-08-192-2/+2
* | | | | | | | Use released rails-deprecated_sanitizerRafael Mendonça França2014-08-193-3/+2
* | | | | | | | Bump ActiveJob's GlobalID dep to 0.2.3+ to fix Railties testsJeremy Kemper2014-08-191-1/+1
* | | | | | | | Merge pull request #16564 from zzak/move_time_travel_testJeremy Kemper2014-08-192-69/+68
|\ \ \ \ \ \ \ \
| * | | | | | | | Move TimeHelperTest to TimeTravelTest from `as/test_test.rb`Zachary Scott2014-08-192-69/+68
* | | | | | | | | Fix the rails-dom-testing dependecyRafael Mendonça França2014-08-193-1/+3
* | | | | | | | | Merge pull request #16563 from arthurnn/add_ar_raise_trans_optionRafael Mendonça França2014-08-191-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add default .raise_in_transactional_callbacks option to templateArthur Neves2014-08-191-0/+5
* | | | | | | | | | loofah require dependecy is not needed anymoreRafael Mendonça França2014-08-192-4/+0
* | | | | | | | | | Merge pull request #16349 from jmcnevin/masterRafael Mendonça França2014-08-192-9/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correctly determine if migration is needed.Jeremy McNevin2014-08-132-9/+23
* | | | | | | | | | | Merge pull request #16536 from rails/improve-custom-configurationRafael Mendonça França2014-08-198-46/+149
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve custom configurationRafael Mendonça França2014-08-198-46/+149
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Protect against error when parsing parameters with Bad RequestRafael Mendonça França2014-08-193-2/+30
* | | | | | | | | | | Merge pull request #16299 from sikachu/ps-safer-ac-paramsJeremy Kemper2014-08-195-39/+382
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | User `#to_hash` instead of calling `super`Prem Sichanugrist2014-08-181-1/+1
| * | | | | | | | | | Fix failing test on several methods on ParameterPrem Sichanugrist2014-08-183-3/+36
| * | | | | | | | | | Seperate Parameters accessors and mutators testsPrem Sichanugrist2014-08-183-57/+215
| * | | | | | | | | | Refactor code to reduce duplicate `self.class.new`Prem Sichanugrist2014-08-181-12/+10
| * | | | | | | | | | Add missing `Hash` methods to `AC::Parameters`Prem Sichanugrist2014-08-182-0/+61
| * | | | | | | | | | Make `AC::Params#to_h` return Hash with safe keysPrem Sichanugrist2014-08-183-0/+93
* | | | | | | | | | | Merge pull request #16562 from arthurnn/missing_string_requireRafael Mendonça França2014-08-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add missing AS requireArthur Neves2014-08-191-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-1914-33/+62
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Update links in getting_started guide.Juanito Fatas2014-08-161-5/+5
| * | | | | | | | | `overriden` => `overridden`Vipul A M2014-08-131-1/+1
| * | | | | | | | | Uppercase HTML in docs.Hendy Tanata2014-08-0814-37/+37
| * | | | | | | | | [ci skip] Document ActionDispatch::Staticschneems2014-08-051-0/+9
| * | | | | | | | | [ci skip] document ActionDispatch::FileHandlerschneems2014-08-051-0/+10
| * | | | | | | | | [ci skip] Document PublicExceptions middlewareschneems2014-08-051-0/+10
* | | | | | | | | | minor copy editing [ci skip]Vijay Dev2014-08-191-3/+1
* | | | | | | | | | Merge pull request #16487 from jayshepherd/patch-1Rafael Mendonça França2014-08-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Small grammar fix in pluck descriptionJay Shepherd2014-08-121-1/+1
* | | | | | | | | | | Merge pull request #16559 from splattael/jruby-queue_classicRafael Mendonça França2014-08-192-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Skip adapter queue_classic for JRubyPeter Suschlik2014-08-191-0/+1
| * | | | | | | | | | | Gem `queue_classic` does not support JRubyPeter Suschlik2014-08-191-1/+1
* | | | | | | | | | | | Merge pull request #16556 from jonatack/patch-9Robin Dupret2014-08-191-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |