aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #18938 from tchandy/updating_query_tracer_linkArthur Nogueira Neves2015-02-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Updating Query Tracer github repository
| * | | | | | | Updating Query Tracer github repositoryThiago Pradi2015-02-141-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-02-145-20/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Add some more code highlights.Juanito Fatas2015-02-101-5/+5
| | | | | | | | |
| * | | | | | | | Do not use the same name for two `:belongs_to`claudiob2015-02-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A model cannot have two `:belongs_to` with the same exact name, so we are better off avoiding this code in our examples, which might mislead users in thinking it's admissible. [ci skip]
| * | | | | | | | AM#Dirty doc fixesVipul A M2015-02-011-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Grammar fixes - Add doc for changes_include? - implemntations => implementations
| * | | | | | | | Fix description for AM::CallbacksVipul A M2015-01-311-1/+1
| | | | | | | | |
| * | | | | | | | Wording fixes for `:skip_after_callbacks_if_terminated` callbacks optionVipul A M2015-01-311-2/+2
| | | | | | | | |
| * | | | | | | | [ci skip] Add a missing space in t.belongs_to argument.Juanito Fatas2015-01-291-1/+1
| | | | | | | | |
* | | | | | | | | Mention `where.not` in the exampleGodfrey Chan2015-02-142-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...so it doesn't look like you *have* to use SQL strings for that case (not anymore!). Would like to replace the SQL string example with something that you cannot do with the "normal" query API, but I could not come up with a short, realistic example. Suggestions welcome!
* | | | | | | | | Fixed a bug where NULLs are casted into the first enum valueGodfrey Chan2015-02-132-3/+9
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Partially revert ae33aeaGodfrey Chan2015-02-132-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using enum names in SQL strings doesn't actually work, the test was wrong (fixed in 3dfd1ba).
* | | | | | | | Break up these testsGodfrey Chan2015-02-131-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we have coverage for both the find/build cases
* | | | | | | | oops, 'format' is not a real enumGodfrey Chan2015-02-131-8/+8
| | | | | | | |
* | | | | | | | Enums mapping is a HWIA [ci skip]Godfrey Chan2015-02-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous edit kind of de-emphasized that, so changing it to be more explict. (It also avoids showing it as if it's a string-keyed hash.)
* | | | | | | | Enums should be referred to by symbolsGodfrey Chan2015-02-132-6/+20
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated the documentation about the new ability to query them normally, and added test to make sure they work!
* | | | | | | Add missing commaArthur Neves2015-02-131-1/+1
| | | | | | |
* | | | | | | Merge pull request #16381 from kakipo/validate-length-tokenizerRafael Mendonça França2015-02-134-7/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow symbol as values for `tokenizer` of `LengthValidator`
| * | | | | | | Allow symbol as values for `tokenize` of `LengthValidator`kakipo2014-08-034-7/+32
| | | | | | | |
* | | | | | | | Merge pull request #18924 from tgxworld/correct_module_in_depre_msgKasper Timm Hansen2015-02-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correct module name in deprecation message.
| * | | | | | | | Correct module name in deprecation message.Guo Xiang Tan2015-02-131-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #18923 from tgxworld/fix_deprecation_warning_messageKasper Timm Hansen2015-02-131-4/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve deprecation warning message
| * | | | | | | | Improve deprecation message.Guo Xiang Tan2015-02-131-1/+3
| | | | | | | | |
| * | | | | | | | Do not recommend `xhr` since it is going to be deprecated.Guo Xiang Tan2015-02-131-3/+0
| | | | | | | | |
* | | | | | | | | remove CHANGELOG entry for Rails 5.0 only feature. #18918Yves Senn2015-02-131-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `has_secure_token` hasen't been released yet. No need to track every change in the CHANGELOG.
* | | | | | | | | Merge pull request #18918 from ↵Yves Senn2015-02-133-2/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | morgoth/do-not-overwrite-value-of-secret-token-when-present Do not overwrite secret token value when already present.
| * | | | | | | | | Do not overwrite secret token value when already present.Wojciech Wnętrzak2015-02-123-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` user = User.create(token: "custom-secure-token") user.token # => "custom-secure-token" ```
* | | | | | | | | | Merge pull request #18922 from yui-knk/fix/action_controller_overviewYves Senn2015-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | [ci skip] escape under score
| * | | | | | | | | [ci skip] escape under scoreyui-knk2015-02-131-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #18919 from nerdrew/missing-rack-utils-requireArthur Nogueira Neves2015-02-121-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | require rack/utils in exception_wrapper
| * | | | | | | | require rack/utils in exception_wrapperAndrew Lazarus2015-02-121-0/+1
|/ / / / / / / /
* | | | | | | | remove meta programmingAaron Patterson2015-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there's really no benefit here. It's the same number of lines without the meta programming and is faster
* | | | | | | | there is always an integration session, so remove the checkAaron Patterson2015-02-121-1/+0
| | | | | | | |
* | | | | | | | lazily create the integration sessionAaron Patterson2015-02-122-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now we don't have to call reset! everywhere
* | | | | | | | use before_setup to set up test instance variablesAaron Patterson2015-02-121-7/+6
| | | | | | | |
* | | | | | | | Skip url_helpers instead of caching, speed up integration testseileencodes2015-02-122-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't cache if it's not absolutely necessary. Removes route caching and instead skips using the `url_helpers` is the integration test session doesn't require it. Benchmark ips on integration and controller index method tests below. Without any caching or changes to `#url_helpers`: ``` Calculating ------------------------------------- INDEX: Integration Test 71.000 i/100ms INDEX: Functional Test 99.000 i/100ms ------------------------------------------------- INDEX: Integration Test 728.878 (± 8.0%) i/s - 3.692k INDEX: Functional Test 1.015k (± 6.7%) i/s - 5.148k Comparison: INDEX: Functional Test: 1015.4 i/s INDEX: Integration Test: 728.9 i/s - 1.39x slower ``` With caching on `#url_helpers`: ``` Calculating ------------------------------------- INDEX: Integration Test 74.000 i/100ms INDEX: Functional Test 99.000 i/100ms ------------------------------------------------- INDEX: Integration Test 752.377 (± 6.9%) i/s - 3.774k INDEX: Functional Test 1.021k (± 6.7%) i/s - 5.148k Comparison: INDEX: Functional Test: 1021.1 i/s INDEX: Integration Test: 752.4 i/s - 1.36x slower ``` Afer removing the caching and bypassing the `url_helpers` when not necessary in the session: ``` Calculating ------------------------------------- INDEX: Integration Test 87.000 i/100ms INDEX: Functional Test 97.000 i/100ms ------------------------------------------------- INDEX: Integration Test 828.433 (± 6.4%) i/s - 4.176k INDEX: Functional Test 926.763 (± 7.2%) i/s - 4.656k Comparison: INDEX: Functional Test: 926.8 i/s INDEX: Integration Test: 828.4 i/s - 1.12x slower ```
* | | | | | | | Merge pull request #18915 from kamipo/extract_date_time_precision_testRafael Mendonça França2015-02-124-271/+102
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Extract `DateTimePrecisionTest`
| * | | | | | | | Extract `DateTimePrecisionTest`Ryuta Kamizono2015-02-134-271/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The datetime precision tests for any adapters is duplicated.
* | | | | | | | | Optimize none? and one? relation query methods to use LIMIT and COUNT.Eugene Gilburg2015-02-126-2/+162
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SQL COUNT and LIMIT 1 queries for none? and one? methods if no block or limit is given, instead of loading the entire collection to memory. The any? and many? methods already follow this behavior. [Eugene Gilburg & Rafael Mendonça França]
* | | | | | | | Merge pull request #18844 from ↵Zachary Scott2015-02-121-0/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yuki24/guides-add-render-example-without-partial-and-locals Add tip for skipping `partial` and `locals` options for `render`
| * | | | | | | | Add tip for skipping `partial` and `locals` options for `render`Yuki Nishijima2015-02-081-0/+15
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #11790 from printercu/patch-3Rafael Mendonça França2015-02-123-14/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionController#translate supports symbols
| * | | | | | | | ActionController#translate also lookups shortcut without action nameMax Melentiev2013-10-223-4/+13
| | | | | | | | |
| * | | | | | | | ActionController#translate supports symbolsprintercu2013-09-253-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made it similar to views helper.
* | | | | | | | | Merge pull request #18886 from kamipo/allow_precision_option_for_time_columnRafael Mendonça França2015-02-127-19/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow `:precision` option for time type columns
| * | | | | | | | | Allow `:precision` option for time type columnsRyuta Kamizono2015-02-127-19/+90
| | | | | | | | | |
* | | | | | | | | | Merge pull request #18885 from ypxing/masterRafael Mendonça França2015-02-121-12/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | remove unnecessary assignment/parameter passing in AS::Callbacks...::Around (master branch)
| * | | | | | | | | | remove unnecessary assignment and parameter passing in ↵rxing2015-02-111-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::Callbacks::Filters::Around
* | | | | | | | | | | get rid of transaction warning when running PG tests.Yves Senn2015-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finally removes the warning "WARNING: there is no transaction in progress" when running Active Record tests using PostgreSQL.
* | | | | | | | | | | pg tests, be clear about the missing type that causes a test skip.Yves Senn2015-02-122-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed some cruft in the `setup` and `teardown` methods.