aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | add `bin/rake db:purge` task to empty the current database.Yves Senn2014-06-174-0/+55
| | | |
* | | | fix typo in test method names. [ci skip]Yves Senn2014-06-171-4/+4
| | | |
* | | | Merge pull request #15765 from rahul100885/masterYves Senn2014-06-171-3/+3
|\ \ \ \ | | | | | | | | | | [ci skip] doc corrected : ActiveRecord::Base.connections to ActiveRecord::Base.configurations
| * | | | [ci skip] doc corrected : ActiveRecord::Base.connections to ↵Rahul P. Chaudhari2014-06-171-3/+3
|/ / / / | | | | | | | | | | | | ActiveRecord::Base.configurations
* | | | Formatting fix in AS changelog [ci skip]Juanjo Bazán2014-06-161-2/+5
| | | |
* | | | Merge pull request #15760 from sgrif/sg-decorate-matchingRafael Mendonça França2014-06-166-32/+57
|\ \ \ \ | | | | | | | | | | Promote time zone aware attributes to a first class type decorator
| * | | | Promote time zone aware attributes to a first class type decoratorSean Griffin2014-06-166-32/+57
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactoring revealed the need for another form of decoration, which takes a proc to select which it applies to (There's a *lot* of cases where this form can be used). To avoid duplication, we can re-implement the old decoration in terms of the proc-based decoration. The reason we're `instance_exec`ing the matcher is for cases such as time zone aware attributes, where a decorator is defined in a parent class, and a method called in the matcher is overridden by a child class. The matcher will close over the parent, and evaluate in its context, which is not the behavior we want.
* | | | Merge pull request #15759 from sgrif/sg-extract-type-decoratorRafael Mendonça França2014-06-161-8/+24
|\ \ \ \ | | | | | | | | | | Refactor application of type decorators into an object
| * | | | Refactor application of type decorators into an objectSean Griffin2014-06-161-8/+24
| | | | |
* | | | | Merge pull request #15758 from aditya-kapoor/replace-keywordRafael Mendonça França2014-06-162-4/+4
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] /javascript/ ~> JavaScript
| * | | | | [ci skip] /javascript/ ~> JavaScriptAditya Kapoor2014-06-172-4/+4
|/ / / / /
* | | | | Merge pull request #15756 from aditya-kapoor/add-api-doc-for-queryingZachary Scott2014-06-161-1/+9
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] add API doc for AR Group.
| * | | | [ci skip] add API doc for AR Group.Aditya Kapoor2014-06-171-1/+9
|/ / / /
* | | | :scissors: and :nail_care: from d60c405 [ci skip]Zachary Scott2014-06-161-3/+3
| | | |
* | | | Merge pull request #15751 from aditya-kapoor/correct-serialization-docZachary Scott2014-06-161-11/+11
|\ \ \ \ | | | | | | | | | | [ci skip] correct doc for serialization in accordance with API Doc Guide
| * | | | [ci skip] correct doc for serialization in accordance with API Doc GuideAditya Kapoor2014-06-161-11/+11
| | | | |
* | | | | Merge pull request #15755 from sgrif/sg-dirty-refactorRafael Mendonça França2014-06-163-9/+26
|\ \ \ \ \ | | | | | | | | | | | | Refactor in-place dirty checking to use the attribute object
| * | | | | Refactor in-place dirty checking to use the attribute objectSean Griffin2014-06-163-9/+26
| | | | | |
* | | | | | Add important plugins as one of the tasks of the releaseRafael Mendonça França2014-06-161-0/+12
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #15684 from aditya-kapoor/add-tests-for-assert-valid-keysRafael Mendonça França2014-06-161-0/+15
|\ \ \ \ \ | | | | | | | | | | | | Add test cases for Hash#asset_valid_keys
| * | | | | Add test cases for Hash#asset_valid_keysAditya Kapoor2014-06-141-0/+15
| | | | | |
* | | | | | Merge pull request #13963 from lucas-clemente/pending_migrationsRafael Mendonça França2014-06-162-5/+58
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Skip migration check if adapter doesn't support it
| * | | | | skip migration check if adapter doesn't support itLucas Clemente2014-04-192-5/+58
| | | | | |
* | | | | | Merge pull request #15744 from mmozuras/special_keys_setYves Senn2014-06-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change Http::Cache::SPECIAL_KEYS from Array to Set
| * | | | | | Change Http::Cache::SPECIAL_KEYS from Array to SetMindaugas Mozūras2014-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slightly improves performance, for example, a simple benchmark: ```ruby require 'benchmark/ips' require 'set' SPECIAL_KEYS = %w[extras no-cache max-age public must-revalidate] SPECIAL_KEYS_SET = Set.new(SPECIAL_KEYS) directive = 'must-revalidate' Benchmark.ips do |x| x.report('array') { SPECIAL_KEYS.include?(directive) } x.report('set') { SPECIAL_KEYS_SET.include?(directive) } end ``` Output: ``` ------------------------------------- array 67926 i/100ms set 74054 i/100ms ------------------------------------- array 2318423.4 (±2.8%) i/s - 11615346 in 5.014899s set 3387981.8 (±4.7%) i/s - 16958366 in 5.019355s ```
* | | | | | | Merge pull request #15743 from tgxworld/remove_unused_parametersYves Senn2014-06-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused parameter.
| * | | | | | | Remove unused parameter.Guo Xiang Tan2014-06-151-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #15722 from akshay-vishnoi/spell-correctZachary Scott2014-06-158-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] /mysql/i -> MySQL, Spell correct in continuation to #15555
| * | | | | | | /mysql/i -> MySQL, Spell correct in continuation to #15555Akshay Vishnoi2014-06-148-11/+11
| | | | | | | |
* | | | | | | | Merge pull request #15723 from akshay-vishnoi/sql-correctionZachary Scott2014-06-152-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Use `an` for SQL
| * | | | | | | | [ci skip] Use `an` for SQLAkshay Vishnoi2014-06-142-3/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #15748 from akshay-vishnoi/activemodelRafael Mendonça França2014-06-151-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correct typo, add test for validates_absence_of
| * | | | | | | | Correct typo, add test for validates_absence_of, correct method namesAkshay Vishnoi2014-06-161-3/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #15745 from mmozuras/remove_unused_separators_paramRafael Mendonça França2014-06-151-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove unused param 'separators' from RouteSet#build_path
| * | | | | | | Remove unused param 'separators' from RouteSet#build_pathMindaugas Mozūras2014-06-151-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #15741 from sgrif/sg-update-deprecation-messageYves Senn2014-06-151-8/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change the deprecation warning on `serialized_attributes`
| * | | | | | | Change the deprecation warning on `serialized_attributes`Sean Griffin2014-06-151-8/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | to "without replacement"
* | | | / / / allow preview interceptors to be registered through `config.action_mailer`.Yves Senn2014-06-154-1/+41
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was partially broken because `preview_interceptors=` just assigned the raw values, whithout going through `register_preview_interceptor`. Now the Action Mailer railtie takes care of the `preview_interceptors` option. This commit is a partial revert of: Revert "Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base" This reverts commit a15704d7f35f17d34d0118546799141d6f853656, reversing changes made to 1bd12a8609d275ad75fcc4b622ca4f5b32dc76be. /cc @kuldeepaggarwal @y-yagi
* | | | | | Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_baseYves Senn2014-06-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] correct doc for `register_preview_interceptor`
| * | | | | | [ci skip] correct doc for `register_preview_interceptor`yuuji.yaginuma2014-06-151-1/+1
| | | | | | |
* | | | | | | Merge pull request #15738 from kuldeepaggarwal/remove-unwanted-codeYves Senn2014-06-152-13/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | remove unnecessary calling of `I18n.backend.store_translations('empty', {})`
| * | | | | | remove unnecessary calling of `I18n.backend.store_translations(empty, {})`Kuldeep Aggarwal2014-06-152-13/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Clean up I18n stored translations after test continuation with #15714
* | | | | | Merge pull request #15737 from kuldeepaggarwal/fix-buildYves Senn2014-06-141-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | reload I18n as we are defining `:ts` locale in `test_number_to_human_with_custom_translation_scope`
| * | | | | | reload I18n as we are defining `:ts` localeKuldeep Aggarwal2014-06-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913.
* | | | | | | Merge pull request #15735 from aditya-kapoor/update-wiki-mdZachary Scott2014-06-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip] update wiki link for MVC in README
| * | | | | | [ci skip] update wiki link for MVCAditya Kapoor2014-06-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #15734 from aditya-kapoor/correct-linkZachary Scott2014-06-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci-skip] correct wikipedia MVC link
| * | | | | | [ci-skip] correct wikipedia MVC linkAditya Kapoor2014-06-141-1/+1
| | | | | | |
* | | | | | | Edit pass on `has_secure_password` documentation [ci skip]Godfrey Chan2014-06-141-5/+6
|/ / / / / /
* | | | | | Merge pull request #15704 from sgrif/sg-deprecate-serializedYves Senn2014-06-143-18/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecate `serialized_attributes` without replacement