aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Improve railties changelog entry and move latest to the top [ci skip]Carlos Antonio da Silva2014-11-121-8/+7
| | | |
* | | | Merge pull request #17593 from igas/paths-unshift-arityRafael Mendonça França2014-11-122-2/+7
|\ \ \ \ | | | | | | | | | | Fix Rails::Paths::Path.unshift interface
| * | | | Fix Rails::Paths::Path.unshift interfaceIgor Kapkov2014-11-122-2/+7
| | | | |
* | | | | Merge pull request #17596 from aderyabin/follow_convensionRafael Mendonça França2014-11-121-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Follow the coding conventions
| * | | | Follow the coding conventionsAndrey Deryabin2014-11-121-1/+1
|/ / / /
* | | | Merge pull request #17348 from DavidGeukers/rake_test_allDavid Heinemeier Hansson2014-11-123-6/+28
|\ \ \ \ | |/ / / |/| | | simplify rake test vs rake test:all
| * | | Simplify rake test vs rake test:allDavid Geukers2014-11-103-6/+28
| | | | | | | | | | | | | | | | Renames `rake test:all` to `rake test` by changing old `rake test:run` to previous version of `rake test:all`. Removes old definition of `rake test`. Also renames `rake test:all:db` to `rake test:db` and deprecates `rake test:all` & `rake test:all:db`
* | | | Merge pull request #17588 from djpowers/patch-1Zachary Scott2014-11-111-2/+2
|\ \ \ \ | | | | | | | | | | [ci skip] Use American English and replace "behaviour" with "behavior".
| * | | | Replace "behaviour" with "behavior"Dave Powers2014-11-111-2/+2
|/ / / / | | | | | | | | Update to consistently use American English [ci skip]
* | | | Merge pull request #17047 from betesh/masterRafael Mendonça França2014-11-111-0/+1
|\ \ \ \ | | | | | | | | | | Time includes DateAndTime::Zones acts_like(:time)
| * | | | Time includes DateAndTime::Zones acts_like(:time)betesh2014-11-091-0/+1
| | | | |
* | | | | Merge pull request #17580 from ccutrer/change_table_nameYves Senn2014-11-113-17/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | add a Table#name accessor like TableDefinition#name
| * | | | | add a Table#name accessor like TableDefinition#nameCody Cutrer2014-11-103-17/+29
| | | | | |
* | | | | | Make FlashHash#key? work with symbol and stringRafael Mendonça França2014-11-112-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Closes #17586
* | | | | | Remove unnecessary double spaceclaudiob2014-11-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the following in two places: ```diff -require ::File.expand_path('../config/environment', __FILE__) +require ::File.expand_path('../config/environment', __FILE__) ```
* | | | | | Merge branch 'rm-fix-secret-token-fallback'Rafael Mendonça França2014-11-109-23/+143
|\ \ \ \ \ \
| * | | | | | :scissors:Rafael Mendonça França2014-11-101-1/+1
| | | | | | |
| * | | | | | No need to sync config.secret_token and secrets.secret_tokenRafael Mendonça França2014-11-102-41/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just prefer secrets over config
| * | | | | | Merge pull request #16535 from bf4/patch-1Rafael Mendonça França2014-11-109-23/+180
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | 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 Fleischer2014-11-029-23/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `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_/'
* | | | | | | dependencies.rb: keep the decorated #load and #require private [closes #17553]Xavier Noria2014-11-103-13/+36
| | | | | | |
* | | | | | | Merge pull request #17585 from aderyabin/remove_limited_update_conditionsRafael Mendonça França2014-11-102-8/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | remove never called method `limited_update_conditions`
| * | | | | | remove never called method `limited_update_conditions`Andrey Deryabin2014-11-112-8/+0
| | | | | | |
* | | | | | | Merge pull request #17579 from aderyabin/cleanup_sqliteRafael Mendonça França2014-11-101-6/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Tiny improvement in sqlite3 adapter
| * | | | | | | tiny code improvement in sqlite3 adapter:Andrey Deryabin2014-11-101-6/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove unused method `supports_add_column?` - change additional restriction method to `valid_alter_table_type?` - fix code style
* | | | | | | Merge pull request #17578 from codeodor/fix-17217-test-bugRafael Mendonça França2014-11-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix bug found when running individual tests against #17217 after merging
| * | | | | | | Fixes a bug found when running individual tests against #17217 after mergingSammy Larbi2014-11-101-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #11694 from ↵Rafael Mendonça França2014-11-103-1/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empact/association-bind-values-not-updated-on-save Fix that a collection proxy could be cached before the save of the owner, resulting in an invalid proxy lacking the owner’s id Conflicts: activerecord/CHANGELOG.md
| * | | | | | Fix that a collection proxy could be cached before the save of the owner, ↵Ben Woosley2014-10-033-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resulting in an invalid proxy lacking the owner’s id. Absent this fix calls like: owner.association.update_all to behave unexpectedly because they try to act on association objects where owner_id is null. more evidence here: https://gist.github.com/Empact/5865555 ``` Active Record 3.2.13 -- create_table(:firms, {:force=>true}) -> 0.1371s -- create_table(:clients, {:force=>true}) -> 0.0005s 1 clients. 1 expected. 1 clients updated. 1 expected. ``` ``` Active Record 4.0.0 -- create_table(:firms, {:force=>true}) -> 0.1606s -- create_table(:clients, {:force=>true}) -> 0.0004s 1 clients. 1 expected. 0 clients updated. 1 expected. ```
* | | | | | | docs, minor changes in Active Job documentation. [ci skip]Yves Senn2014-11-102-6/+5
| | | | | | |
* | | | | | | Remove useless `only_path: true` in path helpersGodfrey Chan2014-11-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We added a deprecation warning for these cases in aa1fadd, so these are now causing deprecation warnings in the test output. AFAICT, in these two cases, the option is not integral to the purpose of the test, so they can be safely removed
* | | | | | | Pass the route name explicitlyGodfrey Chan2014-11-102-1/+14
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to 212057b9. Since that commit, we need to pass the `route_name` explicitly. This is one of the left-over cases that was not handled in that commit, which was causing `use_route` to be ignored in functional tests.
* | | | | | Revert the behavior of booleans in string columns to that of 4.1Sean Griffin2014-11-093-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why are people assigning booleans to string columns? >_> We unintentionally changed the behavior on Sqlite3 and PostgreSQL. Boolean values should cast to the database's representation of true and false. This is 't' and 'f' by default, and "1" and "0" on Mysql. The implementation to make the connection adapter specific behavior is hacky at best, and should be re-visted once we decide how we actually want to separate the concerns related to things that should change based on the database adapter. That said, this isn't something I'd expect to change based on my database adapter. We're storing a string, so the way the database represents a boolean should be irrelevant. It also seems strange for us to give booleans special behavior at all in string columns. Why is `to_s` not sufficient? It's inconsistent and confusing. Perhaps we should consider deprecating in the future. Fixes #17571
* | | | | | Merge pull request #17572 from rishijain/update_docs_10Zachary Scott2014-11-093-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed grammar about AS::Notifications [ci skip]
| * | | | | | added description for rails generators, and fixed sentence formation for ↵Rishi Jain2014-11-103-1/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | active_support/notifications [ci skip]
* | | | | | Merge pull request #17217 from codeodor/fix-17119Aaron Patterson2014-11-097-3/+25
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Ensure HABTM relationships produce valid class names (Fixes #17119)
| * | | | | Ensure HABTM relationships produce valid class names (Fixes #17119)Sammy Larbi2014-11-097-3/+25
|/ / / / /
* | | | | Merge pull request #17564 from yui-knk/fix/command_line_guideRobin Dupret2014-11-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fix typo in command_line.md
| * | | | | [ci skip] Fix typo in command_line.mdyui-knk2014-11-091-1/+1
|/ / / / /
* | | | | Merge pull request #17563 from yui-knk/fix/source_annotation_extractorZachary Scott2014-11-081-3/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | [ci skip] Fix comment of SourceAnnotationExtractor#find_in
| * | | | Fix comment of SourceAnnotationExtractor#find_inyui-knk2014-11-091-3/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Commit(810af6f) changed which extensions are taken into account, so make to match comment of find_in. And sort extensions to follow the added order.
* | | | Documenting Rails::Info module [ci skip]Zachary Scott2014-11-081-0/+3
| | | |
* | | | Merge pull request #17557 from yui-knk/fix/command_line_guideVijay Dev2014-11-081-6/+2
|\ \ \ \ | | | | | | | | | | [ci skip] Fix line break on command line guide
| * | | | [ci skip] Fix line break on command line guideyui-knk2014-11-081-6/+2
| | | | |
* | | | | Merge pull request #17559 from alfa-jpn/fix/singular_association_cacheSantiago Pastorino2014-11-082-1/+31
|\ \ \ \ \ | | | | | | | | | | | | default scopes should break the cache on singulur_association.
| * | | | | default scopes should break the cache on singulur_association.alfa-jpn2014-11-082-1/+31
| |/ / / / | | | | | | | | | | | | | | | fixes #17495
* | | | | Merge pull request #17476 from robin850/job-testingRobin Dupret2014-11-081-0/+62
|\ \ \ \ \ | |/ / / / |/| | | | Add a section about job testing [ci skip]
| * | | | Add a section about job testing [ci skip]Ryan Selk2014-11-021-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
* | | | | Merge pull request #17493 from petewest/duration-comparableAaron Patterson2014-11-072-0/+14
|\ \ \ \ \ | | | | | | | | | | | | Delegate comparison operator to value
| * | | | | Delegate comparison operator to valuePeter West2014-11-032-0/+14
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:49:09 +0000