aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #21188 from derekprior/dp-asset-host-docsRafael Mendonça França2015-08-101-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update info on browser connection limits [ci skip]
| * | | | | | | | | | | | Update info on browser connection limits [ci skip]Derek Prior2015-08-101-11/+18
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browsers have not been limited to two connections per host for quite some time now. With more connections allowed, the trade-off involved in asset host distribution isn't so clear and it becomes more important that developers measure actual performance before and after.
* | | | | | | | | | | | add a null node at the top of the stackAaron Patterson2015-08-101-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this gives us an easier way to iterate the stack
* | | | | | | | | | | | remove `@nesting` ivarAaron Patterson2015-08-101-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same information is stored in the `@scope` linked list, so just get it from there.
* | | | | | | | | | | | pass `shallow` in to the resource constructorAaron Patterson2015-08-101-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this lets us remove the setter and make the Resource object Read-Only
* | | | | | | | | | | | we have the resource on the stack, so just use itAaron Patterson2015-08-101-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to ask `scope` for the resource because we already have it right here.
* | | | | | | | | | | Merge pull request #21183 from brooksreese/ar_overview_changeAbdelkader Boudih2015-08-101-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Modify introduction to be consistent with other guides
| * | | | | | | | | | | [ci skip] Modify introduction text and bullets to be consistent with other ↵Brooks Reese2015-08-101-5/+5
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guides
* | | | | | | | | | | docs, use hash instead of a string for `order`. [ci skip]Yves Senn2015-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #21121
* | | | | | | | | | | Merge pull request #21124 from kirs/feature/reload-i18nKasper Timm Hansen2015-08-105-3/+114
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reload I18n.load_path in development
| * | | | | | | | | | | Reload I18n locales in developmentKir Shatrov2015-08-105-3/+114
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Update Gemfile.lockRafael Mendonça França2015-08-101-53/+48
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #21176 from y-yagi/fix_scaffold_tests_inside_api_engineRafael Mendonça França2015-08-092-1/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | make generated scaffold functional tests work inside API engines
| * | | | | | | | | | | make generated scaffold functional tests work inside API enginesyuuji.yaginuma2015-08-092-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * set engine's route in setup * use fixture with engine namespace
* | | | | | | | | | | | Remove wrong commentRafael Mendonça França2015-08-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method raises conditionally not always so we should not documment as it always raise.
* | | | | | | | | | | | Remove the conditional since it is done in the methodRafael Mendonça França2015-08-091-4/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Execute the block when the controller doesn't existRafael Mendonça França2015-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should return when the contoller key is not present or if the controller doesn't exist and we didn't raised an error.
* | | | | | | | | | | | Name the argument according with its jobRafael Mendonça França2015-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related with dc1b937db780155089fce522f03d340e62f5df36
* | | | | | | | | | | | WhitespacesRafael Mendonça França2015-08-091-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | push `scope` calls up one frameAaron Patterson2015-08-091-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eliminates calling `scope` in one method, pushes the other calls up one frame. This goes a little way towards eliminating the internal calls to `scope`.
* | | | | | | | | | | | Merge pull request #21177 from brooksreese/single_crud_operationClaudio B.2015-08-091-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | [ci skip] Note that each action maps to a specific CRUD operation
| * | | | | | | | | | | [ci skip] Note that each action maps to a specific CRUD operationBrooks Reese2015-08-091-1/+3
| | | | | | | | | | | |
* | | | | | | | | | | | remove useless hashAaron Patterson2015-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't really need this hash.
* | | | | | | | | | | | stop calling `scope` internallyAaron Patterson2015-08-082-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to get a grip on what `scope` actually does. This commit removes some of the internal calls to `scope`. Eventually we should add public facing methods that provide the API that `scope` is trying to accomplish.
* | | | | | | | | | | | remove useless conditionalAaron Patterson2015-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `prepare_params!` would raise an exception if `params` wasn't initialized, so it must always be available. Remove the existence conditional from the `controller` method.
* | | | | | | | | | | | eliminate assignment in conditionalAaron Patterson2015-08-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method we called already has the conditional we need. Just add an else block so that we don't need two tests.
* | | | | | | | | | | | Remove `defaults` hash from `Dispatcher`Aaron Patterson2015-08-082-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Dispatcher` doesn't need to hold on to the defaults hash. It only used the hash to determine whether or not it should raise an exception if there is a name error. We can pass that in further up the stack and alleviate Dispatcher from knowing about that hash.
* | | | | | | | | | | | eliminate runtime conditionalAaron Patterson2015-08-081-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know in advance whether the object is a dispatcher or not, so we can configure the Constraints object with a strategy that will call the right method.
* | | | | | | | | | | | whitespaceAaron Patterson2015-08-081-3/+3
| | | | | | | | | | | |
* | | | | | | | | | | | remove the setter from `Scope`Aaron Patterson2015-08-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it isn't used.
* | | | | | | | | | | | Merge pull request #21175 from gringocl/middleware-deprecationsRichard Schneeman2015-08-081-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Reference actual classes
| * | | | | | | | | | | | Reference actual classesMiles Starkenburg2015-08-081-5/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #21173 from repinel/fix-callback-terminator-docsClaudio B.2015-08-081-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fix the AS::Callbacks terminator docs
| * | | | | | | | | | | | | [ci skip] Fix the AS::Callbacks terminator docsRoque Pinel2015-08-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second argument of the terminator lambda is no longer the result of the callback, but the result lambda. https://github.com/rails/rails/blob/3a7609e2bafee4b071fe35136274e6ccbae8cacd/activesupport/test/callbacks_test.rb#L553
* | | | | | | | | | | | | | Merge pull request #21166 from brooksreese/migration_seed_explanationClaudio B.2015-08-081-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | [ci skip] Give in-depth explanation of migrations vs. seeds.rb
| * | | | | | | | | | | | | [ci skip] Give in-depth explanation of migrations vs. seeds.rbBrooks Reese2015-08-081-4/+9
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #21174 from melissawahnish/document_gmailRafael Mendonça França2015-08-081-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Adding a note to Action Mailer Basics documentation that Google increased its security measures
| * | | | | | | | | | | | | [ci skip] Adding a note to Action Mailer Basics documentation that Google ↵melissawahnish2015-08-081-0/+3
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increased its security measures so using the example for Gmail will return a “Password Incorrect” error, and you will receive an email from Google that they blocked a sign-in attempt. You can change your Gmail settings or use another ESP. I discovered this when I was testing a simple mailer example app and was just going to use my personal Gmail account for the test. I think it would be best to note this change since now Gmail may not be the best option for a quick test. I hope this saves time for other Rails developers. The Gmail example does show a good example of how to configure the smpt settings.
* | | | | | | | | | | | | Merge pull request #21167 from AaronLasseigne/use_each_keyKasper Timm Hansen2015-08-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | replace each with each_key when only the key is needed
| * | | | | | | | | | | | replace each with each_key when only the key is neededAaron Lasseigne2015-08-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using each_key is faster and more intention revealing. Calculating ------------------------------------- each 31.378k i/100ms each_key 33.790k i/100ms ------------------------------------------------- each 450.225k (± 7.0%) i/s - 2.259M each_key 494.459k (± 6.3%) i/s - 2.467M Comparison: each_key: 494459.4 i/s each: 450225.1 i/s - 1.10x slower
* | | | | | | | | | | | | Refactor route assertion methods in resources testeileencodes2015-08-081-50/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests and methods were hard to read with `options[:options]` all over the place. This refactoring makes the code easier to understand. The change came out of work for moving the underlying code of controller tests to integraiton tests.
* | | | | | | | | | | | | Merge pull request #11352 from xaviershay/dispatcher-apiRafael Mendonça França2015-08-084-21/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a custom dispatcher to be provided to routing.
| * | | | | | | | | | | | | Allow a custom dispatcher to be provided to routing.Xavier Shay2015-08-074-19/+17
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move `controller_reference` and `controller_class_names` to protectedXavier Shay2015-08-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scope so that they are available to subclasses.
* | | | | | | | | | | | | | Fix deprecation warning in testseileencodes2015-08-083-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the string version of the class reference is now deprecated when referencing middleware. This should be written as a class not as a string. Deprecation warning that this change fixes: ``` DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "ActionDispatch::ShowExceptions" => ActionDispatch::ShowExceptions ```
* | | | | | | | | | | | | | Rename `extra_keys` variables to `query_string_keys`eileencodes2015-08-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `extra_keys` is a confusing variable name because it's not clear what is "extra". This renames it to `query_string_keys` so it's clear that the "extra" is just the query string.
* | | | | | | | | | | | | | Refactor to remove DrawOnce moduleeileencodes2015-08-081-27/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing extra work that could be pushed off to Integration test and SharedRoutes. Creating an extra module isn't necessary when those are created by their respective classes.
* | | | | | | | | | | | | | Merge pull request #21170 from y-yagi/fix_uuid_exampleAbdelkader Boudih2015-08-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use uuid method to define the UUID type [ci skip]
| * | | | | | | | | | | | | | use uuid method to define the UUID type [ci skip]yuuji.yaginuma2015-08-081-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #21169 from yui-knk/doc/route_statusRichard Schneeman2015-08-071-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | [ci skip] Add an explanation for `status` option