aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22800 from dgynn/pr_cache_helper_optionsRafael Mendonça França2016-01-293-1/+16
|\ | | | | | | Restore ability to pass extra options to cache stores
| * restore ability to pass extra options to cache storesDave Gynn2015-12-263-1/+16
| | | | | | | | | | | | | | | | | | The `cache` helper methods should pass any extra options to the cache store. For example :expires_in would be a valid option if memcache was the cache store. The change in commit da16745 broke the ability to pass any options other than :skip_digest and :virtual_path. This PR restores that functionality and adds a test for it.
* | Merge pull request #23326 from fgo/patch-16Rafael França2016-01-281-1/+1
|\ \ | | | | | | Getting Started Guide: Update Ruby version to 2.3.0p0 [ci skip]
| * | Getting Started Guide: Update Ruby version to 2.3.0p0Francis Go2016-01-291-1/+1
|/ /
* | Merge pull request #23323 from maclover7/api-app-docsRafael França2016-01-281-16/+19
|\ \ | | | | | | Docs review of api_app.md
| * | Docs review of api_app.mdJon Moss2016-01-281-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | Pass through correcting api_app.md. The list of included modules and middleware was tested through a sample API app, and was listed in the same order an end user would see in their terminal. [ci skip]
* | | speed up accept header parsing a bit.Aaron Patterson2016-01-281-8/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept header is taken from what Safari on El Capitan sends: ```ruby require 'benchmark/ips' require 'action_dispatch/http/mime_type' require 'active_support/all' accept = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' Benchmark.ips do |x| x.report "omg" do Mime::Type.parse(accept) end end ``` Before: ``` [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 3.181k i/100ms ------------------------------------------------- omg 35.062k (±12.8%) i/s - 174.955k [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 3.153k i/100ms ------------------------------------------------- omg 33.724k (±12.4%) i/s - 167.109k [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 3.575k i/100ms ------------------------------------------------- omg 37.251k (±10.4%) i/s - 185.900k ``` After: ``` [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 3.365k i/100ms ------------------------------------------------- omg 40.069k (±16.1%) i/s - 198.535k [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 4.168k i/100ms ------------------------------------------------- omg 47.596k (± 7.7%) i/s - 237.576k [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 4.282k i/100ms ------------------------------------------------- omg 43.626k (±17.7%) i/s - 209.818k ```
* | Remove Rack::Lock from the API guidesRafael Mendonça França2016-01-281-4/+0
| | | | | | | | | | | | It is not always there anymore [ci skip]
* | Middleware have no pluralRafael Mendonça França2016-01-281-14/+14
| | | | | | | | [ci skip]
* | Mark API guide as work in progressRafael Mendonça França2016-01-281-0/+1
| | | | | | | | The documentation team didn't reviewed it yet so it can't be published.
* | convert AcceptList to a regular classAaron Patterson2016-01-281-20/+19
| | | | | | | | | | | | | | we never use this custom array outside the mime type `parse` method. We can reduce the interaction to just a regular array, so we should use that instead (IOW, there was nothing special about AcceptList so we should remove it).
* | Merge pull request #23319 from piotrj/api_app_in_table_of_contentsJon Moss2016-01-281-0/+4
|\ \ | | | | | | Put "Using Rails for API-only Applications" in table of contents
| * | Put "Using Rails for API-only Applications" in table of contentsPiotr Jakubowski2016-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | When I was looking for more info regarding this the only way I ended up on that page was by googling something along the lines of "rails new api" (as I wanted to find out what are the proper parameters when generating api app). I think it's beneficial to have that page in table of contents.
* | | Merge pull request #23220 from maclover7/fix-23215Richard Schneeman2016-01-281-6/+0
|\ \ \ | | | | | | | | Remove empty lines in Rails development logger
| * | | Remove empty lines in Rails development loggerJon Moss2016-01-241-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is causing bugs like #23215 to occur, due to the extra spaces being inserted. Also, this is fixed upstream in the upcoming release of Sprockets 4.
* | | | Run `file.close` before unlinking for traviseileencodes2016-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works on OSX but for some reason travis is throwing a ``` 1) Error: ExpiresInRenderTest#test_dynamic_render_with_absolute_path: NoMethodError: undefined method `unlink' for nil:NilClass ``` Looking at other tests in Railties the file has a name and we close it before unlinking, so I'm going to try that.
* | | | Bundle update to fix tests locallyRafael Mendonça França2016-01-281-27/+26
| |/ / |/| |
* | | Regression test for rendering file from absolute patheileencodes2016-01-281-0/+11
| | | | | | | | | | | | | | | | | | Test that we are not allowing you to grab a file with an absolute path outside of your application directory. This is dangerous because it could be used to retrieve files from the server like `/etc/passwd`.
* | | Merge pull request #16400 from bogdan/last-with-sqlRafael França2016-01-283-31/+60
|\ \ \ | | | | | | | | Always use SQL limit in Relation#last when limit argument given
| * | | Reworked ActiveRecord::Relation#last to always use SQLBogdan Gusiev2016-01-283-31/+60
|/ / / | | | | | | | | | instead of loading relation
* | | Merge pull request #23307 from mgrachev/fix-schema-migrationsEileen M. Uchitelle2016-01-281-1/+1
|\ \ \ | | | | | | | | Fix a bug with initialize schema_migrations table
| * | | Fix a bug with initialize schema_migrations tableMikhail Grachev2016-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This line causes an error when executing the command: `rails db:drop db:create db:schema:load` ActiveRecord::StatementInvalid: PG::SyntaxError: ERROR: syntax error at or near "{" LINE 1: ...NSERT INTO "schema_migrations" (version) VALUES (#{v}), (#{v...
* | | | Merge pull request #23237 from gsamokovarov/new-welcome-pageDavid Heinemeier Hansson2016-01-284-268/+65
|\ \ \ \ | | | | | | | | | | Introduce new welcome page for new projects
| * | | | Introduce new welcome page for new projectsGenadi Samokovarov2016-01-264-268/+65
| | | | | | | | | | | | | | | | | | | | As requested by David in 23233.
* | | | | Merge pull request #23303 from Empact/find-nth-deprecationRafael França2016-01-281-11/+10
|\ \ \ \ \ | | | | | | | | | | | | Consistently warn that passing an offset to `find_nth` is deprecated
| * | | | | Consistently warn that passing an offset to `find_nth` is deprecatedBen Woosley2016-01-271-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @bogdan pointed out that a `loaded?` relation would not warn that the supplied offset would be removed. This fixes that oversight. https://github.com/rails/rails/commit/16a476e4f8f802774ae7c8dca2e59f4e672dc591#commitcomment-15706834 Although this second argument is probably not widely used, and would be ignored anyway in the loaded? case, this could protect callers from gotchas. [Ben Woosley & Victor Kmita]
* | | | | | :arrow_left: indentationAkira Matsuda2016-01-281-2/+2
| |_|/ / / |/| | | | | | | | | | | | | | [ci-skip]
* | | | | Merge pull request #23299 from CollinGraves/patch-1प्रथमेश Sonpatki2016-01-281-0/+2
|\ \ \ \ \ | | | | | | | | | | | | English explanation to multi-level nested join
| * | | | | English explanation to multi-level nested joinCollin Graves2016-01-271-0/+2
| | | | | | | | | | | | | | | | | | Added an "Or, in English..." explanation to the "Joining Nested Associations (Multiple Level)" example.
* | | | | | Merge pull request #18928 from bogdan/unreversable-orderSean Griffin2016-01-274-2/+69
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Raise AR::IrreversibleOrderError when #reverse_order can not do it's job
| * | | | | Introduce ActiveRecord::IrreversibleOrderErrorBogdan Gusiev2016-01-274-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raises when #reverse_order can not process SQL order instead of making invalid SQL before this patch
* | | | | | Merge pull request #23291 from maclover7/suckerpunch-docs-updateJon Moss2016-01-271-6/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update sucker_punch adapter's description
| * | | | | | Update sucker_punch adapter's descriptionJon Moss2016-01-271-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | remove == from AcceptItemAaron Patterson2016-01-271-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove nonsense definition of == from `AcceptItem`. The definition only compared names and not `q` values or even object identity. The only use was in the `assort!` method that really just wanted the index of the item given the item's name. Instead we just change the caller to use `index` with the block form.
* | | | | | | remove useless private methodsAaron Patterson2016-01-271-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit refactors the private methods that were just aliases to [] to just directly use [] and cache the return values on the stack.
* | | | | | | change `@app_xml_idx` to an lvar and cache it on the stackAaron Patterson2016-01-271-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same strategy as `@text_xml_idx`: cache it on the stack to avoid ivar lookups and the `||=` call.
* | | | | | | change `@text_xml_idx` to an lvar and cache it on the stackAaron Patterson2016-01-271-13/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | this eliminates the ivar lookup and also eliminates the `||=` conditional that happens every time we called the `text_xml_idx` method.
* | | | | | Remove celluloid from the GemfileRafael Mendonça França2016-01-273-25/+1
| | | | | |
* | | | | | Merge pull request #23284 from maclover7/suckerpunch-2Eileen M. Uchitelle2016-01-274-9/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update ActiveJob adapter for sucker_punch 2.0
| * | | | | | Update ActiveJob adapter for sucker_punch 2.0Jon Moss2016-01-274-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR includes two changes for 2.0.0: - Breaking API change around `async.perform` --> `perform_async` - New addition of `perform_in`, which now allows end users of the adapter to use the `enqueued_at` public API method.
* | | | | | | Add tests to #23288Rafael Mendonça França2016-01-271-0/+1
| | | | | | |
* | | | | | | Merge pull request #23288 from bdewater/sprockets3-sha2-altRafael França2016-01-272-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix img alt attribute generation when using Sprockets >= 3.0
| * | | | | | | Fix img alt attribute generation when using Sprockets >= 3.0Bart de Water2016-01-272-1/+6
| | | | | | | |
* | | | | | | | Merge pull request #23289 from keram/patch-1Arthur Nogueira Neves2016-01-271-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo in strong params hash deprecation message
| * | | | | | | | Fix typo in strong params hash deprecation messageMarek2016-01-271-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | and remove unecessary spaces in string interpolation.
* / / / / / / / Do not use default attributes for STI when instantiating a subclassSean Griffin2016-01-272-1/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit which originally added this behavior did not consider that doing `Subclass.new` does not actually populate the `type` field in the attributes (though perhaps it should). We simply need to not use the defaults for STI related things unless we are instantiating the base class. Fixes #23285.
* | | | | | | Merge pull request #23281 from djoume/patch-1Kasper Timm Hansen2016-01-271-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix small typos in asset_pipeline.md
| * | | | | | | Fix typos in asset_pipeline.mdDjoume Salvetti2016-01-271-3/+3
|/ / / / / / /
* | | | | | | Merge pull request #21791 from sonalkr132/persistence-docArthur Nogueira Neves2016-01-271-8/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improvement in ActiveRecord::Persistence doc [ci skip]
| * | | | | | | Improvement in ActiveRecord::Persistence doc [ci skip]Aditya Prakash2015-10-171-8/+9
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 16:38:12 +0000