aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Response etags to always be weak: Prefixed W/ to value returned by ↵abhishek2016-01-205-10/+18
| | | | ActionDispatch::Http::Cache::Response#etag= such that etags set in fresh_when and stale? are weak. For #17556.
* Revert "Its ideal to set Vary: Accept-Encoding, irrespective of whether ↵schneems2016-01-192-2/+2
| | | | | | | | gzipped version exists or not. This is helpful for CDN's to later distinguish assets, based on previous, current copies and introduced gzip version if any." This reverts commit 067c52f608568e35181830a5c1016e382650e655. Conversation: https://github.com/rails/rails/pull/23120#issuecomment-173007011
* Add `ModelSchema::type_for_attribute` to the public APISean Griffin2016-01-191-1/+12
| | | | | | | | | | | We want this method to be the single canonical source of information about type metadata related to a model. This is the method I've been continuously recommending people use if they need this sort of access, as I have no plans to remove or change it at any point in the future. We can do ourselves a favor and get people to use this instead of relying on some other part of the internals that they shouldn't be by making this method public.
* Merge pull request #23120 from vipulnsward/always-set-vary-for-static-assetsRichard Schneeman2016-01-192-2/+2
|\ | | | | Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped or not
| * Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped ↵Vipul A M2016-01-192-2/+2
| | | | | | | | | | | | | | | | version exists or not. This is helpful for CDN's to later distinguish assets, based on previous, current copies and introduced gzip version if any. For ref: https://www.fastly.com/blog/best-practices-for-using-the-vary-header This change sets `Vary` header always, to be on safer side
* | Merge pull request #23125 from Gaurav2728/update_puma_as_webserverRafael França2016-01-194-17/+14
|\ \ | | | | | | [ci skip] update guide for Puma web server instead of Webrick
| * | [ci skip] update guide for Puma web server instead of WebrickGaurav Sharma2016-01-204-17/+14
| | | | | | | | | Rails 5.0 default server puma web server. following commit - https://github.com/rails/rails/commit/ae48ea69
* | | Merge pull request #23124 from vipulnsward/rake-railsYves Senn2016-01-193-5/+5
|\ \ \ | | | | | | | | - Changed from bin/rake to bin/rails at more application places. [ci skip]
| * | | - Changed from bin/rake to bin/rails at more application places.Vipul A M2016-01-203-5/+5
| |/ / | | | | | | | | | | | | | | | | | | - Only ones left are from the upgrading guide, and command line guide explicit section about rake Follow up of https://github.com/rails/rails/pull/23119 [ci skip]
* | | Merge pull request #23123 from schneems/schneems/strong_params_method_missingRichard Schneeman2016-01-192-1/+32
|\ \ \ | |/ / |/| | [close #23084] Deprecated StrongParameters
| * | Link to docs instead of listing methodsschneems2016-01-191-5/+7
| | |
| * | Add methods to StrongParametersschneems2016-01-192-2/+9
| | | | | | | | | It's reasonable to expose different value readers.
| * | [close #23084] Deprecated StrongParametersschneems2016-01-192-0/+22
| | | | | | | | | | | | We can provide a more flexible upgrade experience by warning users they are using unsafe methods instead of forcing the safe API by deprecating before removal. This PR provides this functionality.
* | | Merge pull request #23119 from Gaurav2728/update_guide_to_bin_rails_commandJon Moss2016-01-196-37/+37
|\ \ \ | |_|/ |/| | use bin/rails default instead of rake commands [ci skip]
| * | use bin/rails default instead of rake commands [ci skip]Gaurav Sharma2016-01-196-37/+37
|/ / | | | | I go through the `http://edgeguides.rubyonrails.org/` and found `rake` commands in various files that are in RAILS 5.0 implement by `bin/rails` command. I try to change all that can be directly use `bin/rails …`
* | Merge pull request #23122 from vipulnsward/guides-revampDavid Heinemeier Hansson2016-01-192-14/+1
|\ \ | | | | | | Guides header changes
| * | - Remove dead links and take users to just the home page insteadVipul A M2016-01-192-14/+1
| |/ | | | | | | | | - Add new logo for guides header [ci skip]
* | Merge pull request #23121 from prathamesh-sonpatki/fix-testsYves Senn2016-01-191-4/+5
|\ \ | |/ |/| Fix test failure on PostgreSQL by sorting the result before comparison
| * Fix test failure on PostgreSQL by sorting the result before comparisonPrathamesh Sonpatki2016-01-191-4/+5
|/
* run `type` column through attribtues API type casting.Yves Senn2016-01-193-0/+84
| | | | | | | Closes #21986. This makes it possible to write custom types that define a different mapping for STI columns.
* Merge pull request #23117 from vipulnsward/22297-ar-exception-raiseAbdelkader Boudih2016-01-191-1/+1
|\ | | | | Mention that halting chain does not re-raise `ActiveRecord::RecordIn…
| * Mention that halting chain does not re-raise `ActiveRecord::RecordInvalid` ↵Vipul A M2016-01-191-1/+1
| | | | | | | | | | | | | | | | exception as well, similar to `ActiveRecord::Rollback` Fixes #22297 [ci skip]
* | Merge pull request #23116 from vipulnsward/22648-html-safe-textप्रथमेश Sonpatki2016-01-191-1/+1
|\ \ | | | | | | Make text about render :html option clearer to state, text will get e…
| * | Make text about render :html option clearer to state, text will get escaped ↵Vipul A M2016-01-191-1/+1
| |/ | | | | | | | | | | | | if not marked as safe by using html_safe Fixes #22648 [ci skip]
* | Merge pull request #23114 from ↵Kasper Timm Hansen2016-01-191-2/+2
|\ \ | |/ |/| | | | | y-yagi/refer_to_rails_command_instead_of_rake_in_environment_error refer to rails command instead of rake in environment error
| * refer to rails command instead of rake in environment erroryuuji.yaginuma2016-01-191-2/+2
| | | | | | | | It has been to use an overall rails command in ea4f0e2baba8653b03fba154357842933cf7b778, in order to unify.
* | Merge pull request #23112 from prathamesh-sonpatki/association-guides-fixesKasper Timm Hansen2016-01-191-6/+6
|\ \ | | | | | | Fix discrepancies in associations guide [ci skip]
| * | Fix discrepancies in associations guide [ci skip]Prathamesh Sonpatki2016-01-191-6/+6
|/ / | | | | | | - Followup of https://github.com/rails/rails/commit/71ff088a09d429657877ddfb58985d30df63fc8a
* | Merge pull request #23110 from amitsuroliya/application_recordप्रथमेश Sonpatki2016-01-191-2/+2
|\ \ | |/ |/| `ApplicationRecord` instead of `ActiveRecord::Base` in Association G…
| * `ApplicationRecord` instead of `ActiveRecord::Base` in Association Guides ↵amitkumarsuroliya2016-01-191-2/+2
|/ | | | [ci skip]
* Remove incomplete filter runs all tests in plugins.Kasper Timm Hansen2016-01-181-8/+0
| | | | Forgot to remove it, when I changed the expectations in 88881d2.
* Don't run all tests when files end in a colon.Kasper Timm Hansen2016-01-182-9/+1
| | | | | | | | | | | | | | If running `bin/rails t test/models/bunny_test.rb:` we'd implicitly run all the tests in the bunny test. I now highly doubt that people would ever put in a line filter without a line *and* want that to mean run all tests in that file. Instead, change regex to require a line digit after the colon, so runs without a line at the end would fail to require the test file. This also has the side benefit of breaking requiring a file with many colons: `bin/rails t test/models/bunny_test.rb:::::::::::::4` Think this means I've had enough colonoscopy to last me through the year :)
* Merge pull request #23099 from vipulnsward/change_start_at_end_atKasper Timm Hansen2016-01-185-92/+56
|\ | | | | Changed options for find_each and variants to have options start/finish
| * Changed options for find_each and variants to have options start/finish ↵Vipul A M2016-01-185-92/+56
| | | | | | | | | | | | instead of start_at/end_at based on comments at https://github.com/rails/rails/pull/12257#issuecomment-74688344
* | Merge pull request #23006 from Edouard-chin/code_statistic_ignore_hidde_filesKasper Timm Hansen2016-01-182-2/+15
|\ \ | | | | | | CodeStatistic will now ignore hidden files:
| * | CodeStatistic will now ignore hidden files:Edouard CHIN2016-01-182-2/+15
| | | | | | | | | | | | - Modify the default regex to not match hidden files
* | | Merge pull request #21555 from amitsuroliya/associated_basicsJon Moss2016-01-183-230/+230
|\ \ \ | | | | | | | | Association Guide replaces Order as example with Author-Book Example …
| * | | Association Guide replaces Order as example with Author-Book Example [ci skip]amitkumarsuroliya2016-01-183-230/+230
|/ / / | | | | | | fixes #21500
* | | Merge pull request #22705 from ↵Jon Moss2016-01-181-2/+28
|\ \ \ | | | | | | | | | | | | | | | | RochesterinNYC/add-order-explanation-to-first-last-guides Add clarification about `first` and `last` behavior when using `order` [ci skip]
| * | | Add clarification about `first` and `last` behavior when using `order` [ci skip]James Wen2015-12-201-2/+28
| | | |
* | | | Merge pull request #23088 from prathamesh-sonpatki/update-gemfile-lockSantiago Pastorino2016-01-181-2/+1
|\ \ \ \ | | | | | | | | | | Checked in changes to Gemfile.lock on latest master
| * | | | Checked in changes to Gemfile.lock on latest masterPrathamesh Sonpatki2016-01-171-2/+1
| | | | | | | | | | | | | | | | | | | | - Eventmachine version gets updated when `bundle` is run locally.
* | | | | Merge pull request #22394 from j-dexx/update_association_basics_guideJon Moss2016-01-181-3/+13
|\ \ \ \ \ | | | | | | | | | | | | Updated the guides for having a distinct has_many through at the data…
| * | | | | Updated the guides for having a distinct has_many through at the database levelJames Doyley2016-01-181-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current example add_index :person_articles, :article, unique: true Does not work, the `:article` column does not exist as it will be a join table (based on the prior example) so should use :article_id The documentation seems to suggest that it will allow an article to be added only once to a person via the join table, what actually occurs is that it only allows the article to be added to one person, at which point it should be a `belongs_to` association. Also changed the new example to use readings based on the prior example
* | | | | | Merge pull request #23096 from HayleyCAnderson/ha-action-cable-docsJon Moss2016-01-181-20/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Improve Action Cable configuration explanations
| * | | | | | Improve Action Cable configuration explanationsHayley Anderson2016-01-181-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarify wording around how defaults work * Clarify wording around what formatting versus information is required * Separate consumer configuration section since it is important and wordy * Add additional explanation of options for setting consumer configuration * Consolidate consumer configuration information to reduce confusion
* | | | | | | Merge pull request #23097 from prathamesh-sonpatki/psql-hstoreYves Senn2016-01-181-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Explain how HStore columns can be queried [ci skip]
| * | | | | | | Explain how HStore columns can be queried [ci skip]Prathamesh Sonpatki2016-01-181-0/+4
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | - Fixes #22876.
* | | | | | | Merge pull request #23098 from vipulnsward/changelog-passKasper Timm Hansen2016-01-181-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Pass through AP CHANGELOG
| * | | | | | Pass through AP CHANGELOG [ci skip]Vipul A M2016-01-181-2/+2
|/ / / / / /