aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Compare http request type with test equivalent methods, and application ↵Zachary Scott2014-12-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use-cases. Briefly explain difference between Functional and Request type tests. [ci skip]
* | | | | Merge pull request #18246 from aprescott/document-include_all_helpers-settingRafael Mendonça França2014-12-291-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Document the include_all_helpers config setting
| * | | | | Document the include_all_helpers config setting.Adam Prescott2014-12-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This config setting has been available for quite a while but was not documented.
* | | | | | Merge pull request #18244 from cristianbica/remove-object-itselfRafael Mendonça França2014-12-293-25/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Removed Object#itself as it's implemented in ruby 2.2
| * | | | | Removed Object#itself as it's implemented in ruby 2.2Cristian Bica2014-12-293-25/+0
| | | | | |
* | | | | | Rephrase functional testing in its relation to Rails Controller Unit Testing.Zachary Scott2014-12-291-1/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #18243 from JoshCheek/mailer_guide_code_exampleCarlos Antonio da Silva2014-12-291-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Guide for Action Mailer Basics: Un-inline if statement
| * | | | | Un-inline if statementJosh Cheek2014-12-291-1/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | The single line was long enough that it rendered on two lines, causing the example to look like syntactically invalid code.
* | | | | Merge pull request #18240 from shunsukeaida/add_tzinfo_data_to_plugin_gemfileRafael Mendonça França2014-12-291-0/+4
|\ \ \ \ \ | | | | | | | | | | | | plugin's gemfile also needs tzinfo-data in Windows
| * | | | | plugin's gemfile also needs tzinfo-data in WindowsShunsukeAida2014-12-301-0/+4
| | | | | |
* | | | | | Remove some warning with Ruby 2.2Rafael Mendonça França2014-12-291-1/+1
| | | | | |
* | | | | | Ensure `first!` and friends work on loaded associationsSean Griffin2014-12-293-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #18237
* | | | | | Require Arel 7.0.0.alphaSean Griffin2014-12-291-1/+1
| | | | | |
* | | | | | Remove all cases of manuallly wrapping `Arel::Nodes::Quoted`Sean Griffin2014-12-297-34/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer required now that we are injecting a type caster object into the Arel table, with the exception of uniqueness validations. Since it calls `ConnectionAdapter#type_cast`, the value has already been cast for the database. We don't want Arel to attempt to cast it further, so we need to continue wrapping it in a quoted node. This can potentially go away when this validator is refactored to make better use of `where` or the predicate builder.
* | | | | | Pass a type caster when aliasing tables for joinsSean Griffin2014-12-294-10/+15
| | | | | |
* | | | | | Fix failing testsSean Griffin2014-12-291-8/+4
| | | | | |
* | | | | | Extract an explicit type caster classSean Griffin2014-12-298-39/+69
| | | | | |
* | | | | | Rely on the injectable type caster for `arel_table`Sean Griffin2014-12-296-74/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API will require much less consuming code to change to accomodate the removal of automatic type casting from Arel. As long as the predicates are constructed using the `arel_table` off of an AR subclass, there will be no changes that need to happen.
* | | | | | Merge pull request #18097 from k0kubun/readonly-eager_loadRafael Mendonça França2014-12-293-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | `eager_load` preserves readonly flag for associations
| * | | | | | `eager_load` preserves readonly flag for associationsTakashi Kokubun2014-12-303-1/+11
| | |_|/ / / | |/| | | |
* | | | | | Add nodoc to touch at no_touching.rbRafael Mendonça França2014-12-291-1/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | It is already docummented at persistence.rb. [ci skip]
* | | | | Just check if the buffer exists before changing itRafael Mendonça França2014-12-292-6/+4
| | | | |
* | | | | Merge pull request #18236 from vipulnsward/dont-eval-frozenRafael Mendonça França2014-12-292-1/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Fix html_safe string access modifying frozen values
| * | | | When trying to access a character on a string buffer object via `:[]`, if ↵Vipul A M2014-12-292-1/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the object being accessed currently returns `html_safe?` as true, we used to set `@html_safe` variable as true on new object created. When doing something like x = 'Hello'.html_safe x[/a/, 1] would throw an error on ruby 2.2, since when nothign gets matched nil is returned by the code and it tries to set `@html_safe` value to true, which would error since starting 2.2 nil is frozen. This change adds a safety net to avoid setting `@html_safe = true` on frozen objects. Fixes #18235
* | | | Merge pull request #18232 from yousuketto/doc-for-bundler-requireYves Senn2014-12-291-1/+1
|\ \ \ \ | | | | | | | | | | adjust args of Bundler.require in guides [ci skip]
| * | | | adjust args of Bundler.require in guides [ci skip]Yosuke2014-12-291-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Arguments of Bundler.require of generator has been changed from rails4.0.4. https://github.com/rails/rails/blob/v4.0.4/railties/lib/rails/generators/rails/app/templates/config/application.rb#L16
* | | | Merge pull request #18231 from untidy-hair/improve_a_testGuillermo Iguaran2014-12-281-1/+1
|\ \ \ \ | | | | | | | | | | Expectation comes first
| * | | | Expectation comes firstYukio Mizuta2014-12-281-1/+1
|/ / / /
* | | | Minor documentation edits [ci skip]Robin Dupret2014-12-286-19/+19
| | | |
* | | | Merge pull request #18209 from claudiob/bump-to-2-2Guillermo Iguaran2014-12-2810-12/+12
|\ \ \ \ | | | | | | | | | | Require Ruby 2.2 for Rails 5.0
| * | | | Require Ruby 2.2 for Rails 5.0claudiob2014-12-2610-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Stems from [this comment](https://github.com/rails/rails/pull/18203#issuecomment-68138096) by @robin850 and by the blog post http://weblog.rubyonrails.org/2014/12/19/Rails-4-2-final
* | | | | Merge pull request #18213 from agrobbin/moar-concernsSean Griffin2014-12-283-4/+34
|\ \ \ \ \ | | | | | | | | | | | | Actually autoload all second-level directories called `app/*/concerns`
| * | | | | actually autoload all second-level directories called `app/*/concerns`Alex Robbin2014-12-263-4/+34
| | | | | |
* | | | | | docs, cleanup Active Record CHANGELOG. [ci skip]Yves Senn2014-12-281-4/+4
| | | | | |
* | | | | | Merge pull request #18229 from benprew/patch-2Sean Griffin2014-12-281-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update example test documentation
| * | | | | | Update example test documentationBen Prew2014-12-281-4/+2
|/ / / / / / | | | | | | | | | | | | Example does not work with session headers, should use request headers. [ci skip]
* | | | | | Merge pull request #18226 from kamipo/fix_warning_interpreted_as_argument_prefixGuillermo Iguaran2014-12-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix warning: `*' interpreted as argument prefix
| * | | | | | Fix warning: `*' interpreted as argument prefixRyuta Kamizono2014-12-281-1/+1
|/ / / / / /
* | | | | | Merge pull request #18225 from DanOlson/update-without-changing-timestampsSean Griffin2014-12-275-10/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | Provide :touch option to save() to accommodate saving without updating t...
| * | | | | | Provide :touch option to save() to accommodate saving without updating ↵Dan Olson2014-12-275-10/+48
|/ / / / / / | | | | | | | | | | | | | | | | | | timestamps. [#18202]
* | | | | | Provide a better error message for unsupported classes in `serialize`Sean Griffin2014-12-273-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only support classes which provide a no-args constructor to use as a default value. We can provide a more helpful error message if we catch this when `serialize` is called, rather than letting it error when you try to assign the attribute. Fixes #18224
* | | | | | Merge pull request #18220 from kamipo/bigint_primary_key_supportSean Griffin2014-12-276-17/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add bigint primary key support for MySQL.
| * | | | | | Add bigint primary key support for MySQL.Ryuta Kamizono2014-12-285-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: create_table :foos, id: :bigint do |t| end
| * | | | | | Support for any type primary key.Ryuta Kamizono2014-12-284-10/+35
|/ / / / / /
* | | | | | add autoload for `ForeignKeyDefinition`.Yves Senn2014-12-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | /cc @sgrif
* | | | | | reduce duplication in `ConnectionAdapters::Table` docs. [ci skip]Yves Senn2014-12-271-27/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the documentation very closely mirrors the matching docs from `SchemaStatements`. I reduced duplicated copy and added links to the underlying methods for the user to follow.
* | | | | | Add a note about non-buffering servers for AC::LiveAditya Kapoor2014-12-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #18221 from kamipo/refactor_table_definition_primary_keySean Griffin2014-12-271-4/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Refactor `PostgreSQL::TableDefinition#primary_key`
| * | | | | Refactor `PostgreSQL::TableDefinition#primary_key`Ryuta Kamizono2014-12-271-4/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | Because call the `column` method and set the `options[:primary_key]` is handled at `super`, here need only treat the `options[:default]`.
* | | | | Inform Arel we don't need additional type casting in testsSean Griffin2014-12-263-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of the larger refactoring to remove type casting from Arel. We can inform it that we already have the right type by wrapping the value in an `Arel::Nodes::Quoted`. This commit can be reverted when we have removed type casting from Arel in Rail 5.1