Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace "behaviour" with "behavior" | Dave Powers | 2014-11-11 | 1 | -2/+2 |
| | | | Update to consistently use American English [ci skip] | ||||
* | Merge pull request #16535 from bf4/patch-1 | Rafael Mendonça França | 2014-11-10 | 2 | -4/+4 |
|\ | | | | | | | Allow fallback to LegacyKeyGenerator when secret_key_base is not set but secrets.secret_token is | ||||
| * | `secret_token` is now saved in `Rails.application.secrets.secret_token` | Benjamin Fleischer | 2014-11-02 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `secrets.secret_token` is now used in all places `config.secret_token` was - `secrets.secret_token`, when not present in `config/secrets.yml`, now falls back to the value of `config.secret_token` - when `secrets.secret_token` is set, it over-writes `config.secret_token` so they are the same (for backwards-compatibility) - Update docs to reference app.secrets in all places - Remove references to `config.secret_token`, `config.secret_key_base` - Warn that missing secret_key_base is deprecated - Add tests for secret_token, key_generator, and message_verifier - the legacy key generator is used with the message verifier when secrets.secret_key_base is blank and secret_token is set - app.key_generator raises when neither secrets.secret_key_base nor secret_token are set - app.env_config raises when neither secrets.secret_key_base nor secret_token are set - Add changelog Run focused tests via ruby -w -Itest test/application/configuration_test.rb -n '/secret_|key_/' | ||||
* | | [ci skip] Fix typo in command_line.md | yui-knk | 2014-11-09 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #17557 from yui-knk/fix/command_line_guide | Vijay Dev | 2014-11-08 | 1 | -6/+2 |
|\ \ | | | | | | | [ci skip] Fix line break on command line guide | ||||
| * | | [ci skip] Fix line break on command line guide | yui-knk | 2014-11-08 | 1 | -6/+2 |
| | | | |||||
* | | | Merge pull request #17476 from robin850/job-testing | Robin Dupret | 2014-11-08 | 1 | -0/+62 |
|\ \ \ | |/ / |/| | | Add a section about job testing [ci skip] | ||||
| * | | Add a section about job testing [ci skip] | Ryan Selk | 2014-11-02 | 1 | -0/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Cover lower level job testing (assertions about the execution of the job itself). * Add a table with the custom assertions provided by Active Job's `TestHelper` module. * Add an example testing job queuing inside a model | ||||
* | | | Guides: Corrected name for assigns key [ci skip] | Jimmy Petersen | 2014-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | - Integration test example is now using 'articles' name for both path and assigns key. | ||||
* | | | [ci skip] modify default host in command line guide | yuuji.yaginuma | 2014-11-07 | 1 | -2/+2 |
| | | | |||||
* | | | docs, synchronize 4.2. release notes. [ci skip] | Yves Senn | 2014-11-06 | 1 | -4/+11 |
| | | | | | | | | | | | | /cc @chancancode | ||||
* | | | Merge pull request #17529 from slothbear/patch-1 | Yves Senn | 2014-11-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove redundancy [ci skip] | ||||
| * | | | Remove redundancy | Paul Morganthall | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | I love this guide! and "visually see" is redundant. remove "visually", then the sentence reads: > Action Mailer previews provide a way to see how emails look | ||||
* | | | | Replace Html with HTML [ci skip] | Prathamesh Sonpatki | 2014-11-06 | 1 | -2/+2 |
|/ / / | | | | | | | | | | - Everywhere else we using HTML Sanitizer except this place. | ||||
* | | | Update `bin/rake about` [ci skip] | Arun Agrawal | 2014-11-05 | 1 | -6/+1 |
| | | | | | | | | | | | | As we are no more displaying frameworks | ||||
* | | | Add skip-turbolinks entry to 4.2 release notes and improve changelog | Carlos Antonio da Silva | 2014-11-05 | 1 | -0/+4 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Remove skip-gems from 4-2 release notes | Prathamesh Sonpatki | 2014-11-05 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | - This option was removed in https://github.com/rails/rails/commit/bf17c8a531bc80. - [ci skip] | ||||
* | | | [ci skip] fix `config.assets.digest` default value | yuuji.yaginuma | 2014-11-05 | 1 | -1/+1 |
| | | | |||||
* | | | [ci skip] Fixup spelling and grammar in 4.2 guides | eileencodes | 2014-11-04 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Capitalize CSS, SQL Change spelling of favour to favor - updated for consistency, the rest of the document uses "favor". Grammar / spelling pass | ||||
* | | | Mention that articles resource should be added by user in getting started guide | Prathamesh Sonpatki | 2014-11-05 | 1 | -4/+4 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge branch 'master' of github.com:rails/rails | Vijay Dev | 2014-11-04 | 9 | -34/+72 |
|\ \ \ | |||||
| * | | | update rails version for earlier releases in edgeguides | Gaurav Sharma | 2014-11-04 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Tiny documentation styling fixes [ci skip] | Robin Dupret | 2014-11-02 | 1 | -1/+2 |
| | | | |||||
| * | | Add link to API Documentation Guidelines | Dave Powers | 2014-11-01 | 1 | -0/+1 |
| | | | | | | | | | | | | Link to the "English" section to specify American English be used for the Guides [ci skip] | ||||
| * | | Tiny documentation fixes and styling improvements | Robin Dupret | 2014-11-01 | 1 | -10/+15 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Fix break on generated html | Cakey | Buddy Magsipoc | 2014-11-01 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | fixes this : ![http://i.imgur.com/86scI3a.png](http://i.imgur.com/86scI3a.png)) | ||||
| * | | Merge pull request #17040 from clyfe/patch-1 | Rafael Mendonça França | 2014-10-31 | 1 | -2/+4 |
| |\ \ | | |/ | |/| | Explicit route test class | ||||
| | * | Explicit route test class | Claudius Nicolae | 2014-09-24 | 1 | -2/+4 |
| | | | | | | | | | shows the class that the test must extend in order to have the assert_routing method available | ||||
| * | | Tiny documentation improvements [ci skip] | Robin Dupret | 2014-10-31 | 1 | -5/+4 |
| | | | |||||
| * | | Merge pull request #17460 from hbriggs/master | Abdelkader Boudih | 2014-10-31 | 1 | -4/+7 |
| |\ \ | | | | | | | | | Masked authenticity token section, finder options details, misc typos [ci skip] | ||||
| | * | | Add masked authenticity token section, details on finder options, misc typos ↵ | Hannah Briggs | 2014-10-31 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | [ci skip] fix incorrect key in Active Support Instrumentation guide | yuuji.yaginuma | 2014-10-31 | 1 | -5/+5 |
| | | | | |||||
| * | | | Add status code to AS::Instrumentation table, like #17441 [ci skip] | Zachary Scott | 2014-10-30 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add :db_runtime to table [ci skip] | Łukasz Strzałkowski | 2014-10-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | It was missing from table, but is present in sample hash below | ||||
| * | | | correct GlobalID mixin name in the guides | Chris Moylan | 2014-10-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] Fixes typos in section 2.7 "Rails Html Sanitizer", adds content to ↵ | Hannah Briggs | 2014-10-29 | 1 | -3/+3 |
| |/ / | | | | | | | | | | section 2.8 "Rails DOM Testing" | ||||
| * | | better example for tokenizer lambda [ci skip] | Robin Tweedie | 2014-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Splitting on whitespace makes more sense in the context of counting words in an essay. | ||||
| * | | Merge pull request #17039 from zv1n/add_prefix_delimiter | Rafael Mendonça França | 2014-10-28 | 1 | -0/+23 |
| |\ \ | | | | | | | | | Added ability to configure the queue_name_prefix delimiter to ActiveJob::QueueName. | ||||
| | * | | Added queue_name_delimiter attribute. | Terry Meacham | 2014-10-26 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added ActiveJob::Base#queue_name_delimiter to allow for developers using ActiveJob to change the delimiter from the default ('_') to whatever else they may be using (e.g., '.', '-', ...). - Updated source guide to include a blurb about the delimiter. | ||||
| * | | | Mention only_path deprecation in release notes [ci skip] | Godfrey Chan | 2014-10-28 | 1 | -0/+3 |
| | | | | |||||
* | | | | [ci skip] Add highlight to code (form helper guide). | Juanito Fatas | 2014-10-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | [ci skip] No need to indent here (AC overview). | Juanito Fatas | 2014-10-25 | 1 | -6/+6 |
| | | | | |||||
* | | | | [ci skip] Add missing blank line to AR validation. | Juanito Fatas | 2014-10-25 | 1 | -0/+1 |
|/ / / | |||||
* | | | The code was not up-to-date | Akira Matsuda | 2014-10-25 | 1 | -9/+7 |
| | | | |||||
* | | | Fix typo in "Active Record Basics" guide. [ci skip] | nakadai | 2014-10-24 | 1 | -1/+1 |
|/ / | |||||
* | | AR Migrations Guide#Foreign Keys: fix wrong table | Jon Atack | 2014-10-24 | 1 | -1/+1 |
| | | | | | | [skip ci] | ||||
* | | Update CHANGELOG and release notes for e98f2a7 | Godfrey Chan | 2014-10-22 | 1 | -0/+4 |
| | | |||||
* | | Oops, missed a closing bracket [ci skip] | Godfrey Chan | 2014-10-21 | 1 | -1/+1 |
| | | |||||
* | | [ci skip] Provide more reasoning to not accept cosmetic changes | Tu Hoang | 2014-10-21 | 1 | -1/+1 |
| | | |||||
* | | fix wrong #17318 [ci skip] | Igor Kapkov | 2014-10-19 | 1 | -1/+1 |
| | |