aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #17848 from biow0lf/fix-link-in-action_view-baseSean Griffin2014-11-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix link in documentation. [ci skip]
| * | | | | Fix link in documentation. [ci skip]Igor Zubkov2014-11-301-2/+2
|/ / / / /
* | | | | Merge pull request #17846 from biow0lf/bump-ruby-versionMatthew Draper2014-11-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Bump ruby version to 2.1.0 in rails.gemspec too.
| * | | | | Bump ruby version to 2.1.0 in rails.gemspec too.Igor Zubkov2014-11-291-1/+1
|/ / / / /
* | | | | Merge pull request #16833 from sferik/symbol_to_procRafael Mendonça França2014-11-29120-276/+244
|\ \ \ \ \ | | | | | | | | | | | | Pass symbol as an argument instead of a block
| * | | | | Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-29120-276/+244
|/ / / / /
* | | | | adds missing period in test.rb [ci skip]Xavier Noria2014-11-291-1/+1
| | | | |
* | | | | Merge pull request #17816 from byroot/prevent-numeric-to-s-to-allocate-an-arrayRafael Mendonça França2014-11-292-16/+25
|\ \ \ \ \ | | | | | | | | | | | | Prevent Numeric#to_s from allocating an array
| * | | | | Prevent Numeric#to_s from allocating an arrayJean Boussier2014-11-282-16/+25
| |/ / / /
* | | | | Merge pull request #17830 from claudiob/bump-required-ruby-versionRafael Mendonça França2014-11-299-11/+11
|\ \ \ \ \ | | | | | | | | | | | | Bump required Ruby version to 2.1.0
| * | | | | Bump required Ruby version to 2.1.0claudiob2014-11-289-11/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [This article](http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/#maintenance-consequences-and-rails-5-0) states that: > Rails 5.0 is in most likelihood going to target Ruby 2.2. Before the exact minimum version is fully decided, @arthurnn [suggests](https://github.com/rails/rails/pull/17830#issuecomment-64940383) that **at least** version 2.1.0 **must** be required by the `gemspec` files.
* | | | | Merge pull request #17838 from claudiob/remove-ruby19-reference-in-guidesArthur Nogueira Neves2014-11-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove a reference to Ruby 1.9 in Guides
| * | | | | Remove a reference to Ruby 1.9 in Guidesclaudiob2014-11-281-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Now that Rails requires Ruby >= 2.0 there is no need to document Ruby 1.9.
* | | | | Merge pull request #17828 from yui-knk/fix/i18n_guideZachary Scott2014-11-281-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | [ci skip] fix class name
| * | | | [ci skip] fix class nameyui-knk2014-11-291-1/+1
|/ / / /
* | | | Allow failures with Active Job integration testsRafael Mendonça França2014-11-281-0/+1
| | | |
* | | | Allow failures with Active JobRafael Mendonça França2014-11-281-1/+3
| | | |
* | | | Merge pull request #17818 from bigtone1284/edits_refactor_copRafael Mendonça França2014-11-281-1/+1
|\ \ \ \ | | | | | | | | | | fixed indent of end in jdom.rb
| * | | | fixed indent of end in jdom.rbbigtone12842014-11-281-1/+1
| | | | |
* | | | | Merge pull request #17799 from kamipo/refactor_add_column_optionsRafael Mendonça França2014-11-282-6/+14
|\ \ \ \ \ | | | | | | | | | | | | Refactor `add_column_options!`, to move the quoting of default value for :uuid in `quote_value`.
| * | | | | Rename to `quote_default_expression` from `quote_value`Ryuta Kamizono2014-11-282-3/+3
| | | | | |
| * | | | | Refactor `add_column_options!`, to move the quoting of default value for ↵Ryuta Kamizono2014-11-281-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | :uuid in `quote_value`.
* | | | | | Use jquery-rails master to resolve dependenciesRafael Mendonça França2014-11-281-2/+2
| |/ / / / |/| | | | | | | | | | | | | | delayed_job_active_record doesn't allow Rails 5 yet
* | | | | We don't need to use sass-rails 5.0.0.betaRafael Mendonça França2014-11-281-2/+1
| | | | |
* | | | | Start Rails 5 development :tada:Rafael Mendonça França2014-11-2820-2746/+37
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9.
* | | | Merge pull request #17812 from jonatack/patch-8Abdelkader Boudih2014-11-281-19/+19
|\ \ \ \ | | | | | | | | | | 4.2 release notes pass [skip ci]
| * | | | 4.2 release notes pass [skip ci]Jon Atack2014-11-281-19/+19
| | |/ / | |/| |
* | | | Merge pull request #17811 from mrnugget/fixes_nested_association_preloadingSantiago Pastorino2014-11-282-0/+9
|\ \ \ \ | |/ / / |/| | | Adds preloaded_records method to NullPreloader - fixes #16070
| * | | Adds preloaded_records method to NullPreloaderThorsten Ball2014-11-282-0/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | This fixes a regression where preloading association throws an exception if one of the associations in the preloading hash doesn't exist for one record. Fixes #16070
* | | Merge pull request #17808 from ↵Rafael Mendonça França2014-11-285-12/+31
|\ \ \ | | | | | | | | | | | | | | | | yuki24/fix-bug-where-record-not-saved-loses-error-message Fixed a bug where AR::RecordNotSaved loses the given error message
| * | | Fix a bug where AR::RecordNotSaved loses error messagesYuki Nishijima2014-11-275-12/+31
| |/ / | | | | | | | | | | | | | | | Since 3e30c5d, it started ignoring the given error message. This commit changes the behavior of AR::RecordNotSaved#initialize so that it no longer loses the given error message.
* | | Merge pull request #17809 from iainbeeston/remove_ecosystem_from_guidesXavier Noria2014-11-280-0/+0
|\ \ \ | | | | | | | | Remove ecosystem link from guides
| * | | Removed ecosystem link from the header of the guides pagesIain Beeston2014-11-281-1/+0
| | | |
* | | | Merge pull request #17798 from kamipo/refactor_visit_add_columnYves Senn2014-11-282-9/+1
|\ \ \ \ | | | | | | | | | | Refactor `SchemaCreation#visit_AddColumn`
| * | | | Refactor `SchemaCreation#visit_AddColumn`Ryuta Kamizono2014-11-272-9/+1
| | | | |
* | | | | docs, AR no longer makes use of `test:prepare`. [ci skip]Yves Senn2014-11-281-1/+2
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Change originated from https://github.com/rails/rails/pull/17739#issuecomment-64829088 /cc @metaskills
* | | | Merge pull request #17807 from jvperrin/correct-integer-testRafael Mendonça França2014-11-271-1/+1
|\ \ \ \ | | | | | | | | | | Correct test description for large integer test
| * | | | Correct test description for large integer testJason Perrin2014-11-031-1/+1
| | | | |
* | | | | release notes: edit pass [ci skip]Xavier Noria2014-11-271-19/+17
| | | | |
* | | | | release notes: iteration over the description of Global ID [ci skip]Xavier Noria2014-11-271-4/+14
| | | | |
* | | | | Bump to rack 1.6.0.beta2Santiago Pastorino2014-11-271-1/+1
| | | | |
* | | | | Revert "Test against rack master"Santiago Pastorino2014-11-272-4/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 2a4e14db981e38611667d407a975600ee720ada7.
* | | | | Merge pull request #17803 from sadfuzzy/patch-2Abdelkader Boudih2014-11-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update cookies.rb Conflicts: actionpack/lib/action_dispatch/middleware/cookies.rb
* | | | | Merge pull request #17802 from aar0nTw/remove-dependent-with-through-noteRafael Mendonça França2014-11-271-2/+0
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Remove outdate note of :dependent in guide
| * | | | | [ci skip] Remove outdate note of :dependentAaron Huang2014-11-281-2/+0
|/ / / / /
* | | | | Merge pull request #17801 from jonatack/patch-8Rafael Mendonça França2014-11-271-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Clarification follow-up to e2cce6c [ci skip]
| * | | | | Follow-up to e2cce6cJon Atack2014-11-271-2/+2
|/ / / / / | | | | | | | | | | [skip ci]
* | | | | Fix CHANGELOG typo introduced in e2cce6cd [ci skip]Zachary Scott2014-11-271-1/+1
| | | | |
* | | | | Merge pull request #17800 from jonatack/patch-8Zachary Scott2014-11-271-22/+21
|\ \ \ \ \ | | | | | | | | | | | | Action Mailer change log pass [ci skip]
| * | | | | Action Mailer change log passJon Atack2014-11-271-22/+21
| | | | | | | | | | | | | | | | | | [skip ci]