Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rails config for raise on missing translations | Kassio Borges | 2014-01-27 | 7 | -4/+33 |
| | | | | | Add a config to setup whether raise exception for missing translation or not. | ||||
* | Merge pull request #13848 from huoxito/tell-value | Carlos Antonio da Silva | 2014-01-27 | 1 | -1/+1 |
|\ | | | | | Display value when raising due to unscope() issues | ||||
| * | Display value when raising due to unscope() issues | Washington Luiz | 2014-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully make it easier to debug errors. e.g Before: RuntimeError: unscope(where: "deleted_at") failed: unscoping String is unimplemented. After: RuntimeError: unscope(where: "deleted_at") failed: unscoping String "'t'='t'" is unimplemented. | ||||
* | | docs, clarify usage of `action_mailer.default_options`. [ci skip]. Closes ↵ | Yves Senn | 2014-01-27 | 1 | -4/+12 |
| | | | | | | | | #13820. | ||||
* | | Merge pull request #13849 from fgo/patch-12 | Guillermo Iguaran | 2014-01-26 | 1 | -1/+1 |
|\ \ | |/ |/| | Ruby on Rails 4.1 Release Notes: Fix spelling [ci skip] | ||||
| * | Ruby on Rails 4.1 Release Notes: Fix spelling [ci skip] | Francis Go | 2014-01-27 | 1 | -1/+1 |
|/ | |||||
* | Make ActiveSupport::TimeWithZone#xmlschema consistent | Andrew White | 2014-01-26 | 2 | -2/+6 |
| | | | | | | Both Time#xmlschema and DateTime#xmlschema can accept nil values for the fraction_digits parameter. This commit makes this so for TimeWithZone values as well. | ||||
* | Add support for JSON time_precision to Time and DateTime | Andrew White | 2014-01-26 | 4 | -7/+25 |
| | |||||
* | Add CHANGELOG entry for #11464 | Andrew White | 2014-01-26 | 1 | -0/+9 |
| | |||||
* | Rename subsecond_fraction_digits option to time_precision | Andrew White | 2014-01-26 | 4 | -8/+10 |
| | |||||
* | Consolidate JSON encoding tests in one file | Andrew White | 2014-01-26 | 2 | -46/+48 |
| | |||||
* | Customize subsecond digits when encoding DateWithTime | Parker Selbert | 2014-01-26 | 3 | -9/+30 |
| | | | | | | | | | | | The subsecond fraction digits had been hardcoded to 3. This forced all timestamps to include the subsecond digits with no way to customize the value. While the subsecond format is part of the ISO8601 spec, it is not adhered to by all parsers (notably mobile clients). This adds the ability to customize the number of digits used, optionally setting them to 0 in order to eliminate the subsecond fraction entirely: ActiveSupport::JSON::Encoding.subsecond_fraction_digits = 0 | ||||
* | adds a section about booleans in the API guidelines [ci skip] | Xavier Noria | 2014-01-26 | 1 | -0/+47 |
| | |||||
* | API guidelines: revises warning about +...+ [ci skip] | Xavier Noria | 2014-01-26 | 1 | -1/+4 |
| | | | | | | Modern RDoc accepts a few more things in +...+. In particular symbols work now. The current regexp in RDoc is https://github.com/rdoc/rdoc/blob/v4.1.1/lib/rdoc/markup/attribute_manager.rb#L133. | ||||
* | revises references to :allow_(nil|blank) in some docs [ci skip] [Steven Yang ↵ | Xavier Noria | 2014-01-26 | 10 | -26/+12 |
| | | | | | | & Xavier Noria] Closes #11247. | ||||
* | Merge pull request #13846 from gsaks123/patch-1 | Robin Dupret | 2014-01-26 | 1 | -1/+1 |
|\ | | | | | Fix order syntax in find_by_sql example [ci skip] | ||||
| * | Fix order syntax in find_by_sql example | Greg Saks | 2014-01-26 | 1 | -1/+1 |
|/ | |||||
* | Maintain current timezone when changing time during DST overlap | Andrew White | 2014-01-26 | 4 | -3/+30 |
| | | | | | | | | | | | | | | Currently if a time is changed during DST overlap in the autumn then the method `period_for_local` will return the DST period. However if the original time is not DST then this can be surprising and is not what is generally wanted. This commit changes that behavior to maintain the current period if it's in the list of periods returned by `periods_for_local`. It is possible to alter the behavior of `period_for_local` by specifying a second argument but since we may be change from another time that could be either DST or not then this would give inconsistent results. Fixes #12163. | ||||
* | Remove an extra comment [ci skip] | Robin Dupret | 2014-01-26 | 1 | -1/+0 |
| | |||||
* | Support underscored symbols in Action Mailer config | Andrew White | 2014-01-26 | 3 | -5/+37 |
| | | | | | | We allow the use of underscored symbols to represent classes throughout other parts of Rails so it seems incongruous that it's not supported in `register_interceptor` and `register_observer`. | ||||
* | Don't use a class_attribute for ActionMailer::Base.preview_path | Andrew White | 2014-01-26 | 2 | -7/+3 |
| | | | | | Since preview_path is read from ActionMailer::Base when previewing, subclasses can’t change it so don’t there's no need for the extra overhead imposed by using it. | ||||
* | Add the ability to intercept emails before previewing | Andrew White | 2014-01-26 | 4 | -5/+109 |
| | | | | | | | | | | | | | | | | To support the ability for tools like CSS style inliners to operate on emails being previewed this commit adds a hook in a similar fashion to the existing delivery interceptor hook, e.g: class CSSInlineStyler def self.previewing_email(message) # inline CSS styles end end ActionMailer::Base.register_preview_interceptor CSSInlineStyler Fixes #13622. | ||||
* | Merge pull request #13844 from Alamoz/config_grammar | Godfrey Chan | 2014-01-25 | 2 | -2/+2 |
|\ | | | | | thread -> threaded [ci skip] | ||||
| * | Correct grammar from '... allowing both thread web servers ...' to '... ↵ | Adrien Lamothe | 2014-01-25 | 2 | -2/+2 |
|/ | | | | allowing both threaded web servers ...'. | ||||
* | Merge pull request #13841 from robin850/patch-15 | Guillermo Iguaran | 2014-01-25 | 1 | -0/+6 |
|\ | | | | | Add a missing changelog entry for #13825 [ci skip] | ||||
| * | Add a missing changelog entry for #13825 [ci skip] | Robin Dupret | 2014-01-25 | 1 | -0/+6 |
|/ | |||||
* | Add additional tests for #13824 | Andrew White | 2014-01-25 | 1 | -0/+26 |
| | |||||
* | Transform dashes to underscores in resource route names | Byron Bischoff | 2014-01-25 | 2 | -7/+17 |
| | | | | Fixes #13824 | ||||
* | Merge pull request #13772 from chancancode/fix_has_secure_password_for_good | Godfrey Chan | 2014-01-24 | 4 | -81/+132 |
|\ | | | | | Refactored validations rules for has_secure_password | ||||
| * | Some minor fixes | Godfrey Chan | 2014-01-24 | 2 | -3/+2 |
| | | |||||
| * | Removed old tests | Godfrey Chan | 2014-01-24 | 3 | -250/+121 |
| | | |||||
| * | Got all the new tests passing | Godfrey Chan | 2014-01-24 | 1 | -10/+8 |
| | | |||||
| * | Restored the ability to clear the password with user.password= nil (see the ↵ | Godfrey Chan | 2014-01-24 | 1 | -1/+3 |
| | | | | | | | | docs) | ||||
| * | Rewrote the tests for has_secure_password | Godfrey Chan | 2014-01-24 | 3 | -2/+183 |
| | | |||||
* | | Merge pull request #13835 from frodsan/remove_unused_argument | Guillermo Iguaran | 2014-01-24 | 1 | -1/+1 |
|\ \ | |/ |/| | Remove unused argument. | ||||
| * | Remove unused argument. | Francesco Rodriguez | 2014-01-24 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #13785 from kuldeepaggarwal/fix-find_with_multiple_ids | Yves Senn | 2014-01-24 | 2 | -9/+26 |
|\ | | | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary key | ||||
| * | Fix `ActiveRecord::RecordNotFound` error message with custom primary key | Kuldeep Aggarwal | 2014-01-25 | 2 | -9/+26 |
| | | |||||
* | | Merge pull request #13829 from qsymmachus/improve_validates_with_example | Rafael Mendonça França | 2014-01-24 | 1 | -8/+8 |
|\ \ | | | | | | | Reordered classes in AR Validation #validates_with example [ci skip] | ||||
| * | | Reordered classes in AR Validation #validates_with example [ci skip] | John Olmsted & Strand McCutchen | 2014-01-24 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | Person called GoodnessValidator before it was defined. This change will compile the example correctly. | ||||
* | | | Add a test-case for GH #13825 | Guillermo Iguaran | 2014-01-24 | 1 | -2/+8 |
|/ / | |||||
* | | Merge pull request #13828 from bronzle/apploader-should-check-for-file | Guillermo Iguaran | 2014-01-24 | 1 | -1/+1 |
|\ \ | | | | | | | app_rails_loader.rb should check if bin/rails is a File before calling F... | ||||
| * | | app_rails_loader.rb should check if bin/rails is a File before calling ↵ | Byron Bischoff | 2014-01-24 | 1 | -1/+1 |
|/ / | | | | | | | File.read(exe); closes #13825 | ||||
* | | Merge pull request #13811 from mdesantis/issue-13810 | Yves Senn | 2014-01-24 | 3 | -3/+30 |
|\ \ | | | | | | | Fixes #13810 `rake routes` error when mount `Rails::Engine` with empty routes | ||||
| * | | Fix `rake routes` error when `Rails::Engine` with empty routes is mounted; ↵ | Maurizio De Santis | 2014-01-24 | 3 | -3/+30 |
| | | | | | | | | | | | | | | | | | | fixes rails/rails#13810 Squash | ||||
* | | | Merge pull request #13821 from vipulnsward/remove-assignment-in-test | Yves Senn | 2014-01-23 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Remove unused assignment to fix warnings in enum test. | ||||
| * | | | Remove unused assignment to fix warnings in enum test. | Vipul A M | 2014-01-24 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge pull request #13819 from arthurnn/one_require_test | Guillermo Iguaran | 2014-01-23 | 2 | -10/+8 |
|\ \ \ | | | | | | | | | unify param.require tests | ||||
| * | | | unify param.require tests | Arthur Neves | 2014-01-23 | 2 | -10/+8 |
| | | | | |||||
* | | | | Merge pull request #13818 from arthurnn/small_test_case | Guillermo Iguaran | 2014-01-23 | 1 | -0/+7 |
|\ \ \ \ | |/ / / |/| | | | test boolean and number json param parsing |