aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump tested versions of Ruby on CIAndrew White2018-03-311-8/+8
|
* Merge pull request #32390 from yhirano55/modify_twitter_api_link_in_api_guideRyuta Kamizono2018-03-311-1/+1
|\ | | | | [ci skip] Modify twitter api link in api guide
| * [ci skip] Modify twitter api link in api guideYoshiyuki Hirano2018-03-311-1/+1
|/ | | | * The twitter developer site's url was changed.
* Merge pull request #32366 from utilum/use_current_configAndrew White2018-03-301-1/+1
|\ | | | | Use current_config in structure_dump
| * Use current_config in structure_dumputilum2018-03-291-1/+1
| | | | | | | | This looks like a typo from 0f0aa6a275876502e002c054896734d6536ba5cd
* | Merge pull request #32277 from derekprior/dp-deprecate-force-sslGuillermo Iguaran2018-03-307-90/+62
|\ \ | | | | | | Deprecate controller level force_ssl
| * | Deprecate controller level force_sslDerek Prior2018-03-307-90/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Today there are two common ways for Rails developers to force their applications to communicate over HTTPS: * `config.force_ssl` is a setting in environment configurations that enables the `ActionDispatch::SSL` middleware. With this middleware enabled, all HTTP communication to your application will be redirected to HTTPS. The middleware also takes care of other best practices by setting HSTS headers, upgrading all cookies to secure only, etc. * The `force_ssl` controller method redirects HTTP requests to certain controllers to HTTPS. As a consultant, I've seen many applications with misconfigured HTTPS setups due to developers adding `force_ssl` to `ApplicationController` and not enabling `config.force_ssl`. With this configuration, many application requests can be served over HTTP such as assets, requests that hit mounted engines, etc. In addition, because cookies are not upgraded to secure only in this configuration and HSTS headers are not set, it's possible for cookies that are meant to be secure to be sent over HTTP. The confusion between these two methods of forcing HTTPS is compounded by the fact that they share an identical name. This makes finding documentation on the "right" method confusing. HTTPS throughout is quickly becomming table stakes for all web sites. Sites are expected to operate over HTTPS for all communication, sensitive or otherwise. Let's encourage use of the broader-reaching `ActionDispatch::SSL` middleware and elminate this source of user confusion. If, for some reason, applications need to expose certain endpoints over HTTP they can do so by properly configuring `config.ssl_options`.
* | | Merge pull request #32384 from riseshia/remove-expired-documentAndrew White2018-03-301-15/+1
|\ \ \ | | | | | | | | Remove expired explanation [ci skip]
| * | | Remove expired explanation [ci skip]Shia2018-03-301-15/+1
| | | | | | | | | | | | | | | | Override callback doesn't work anymore.
* | | | Remove shadowing variable warningAndrew White2018-03-301-2/+2
|/ / /
* | | Merge pull request #32383 from freeletics/add-missing-requireRyuta Kamizono2018-03-301-0/+1
|\ \ \ | | | | | | | | Adding missing extension for `cattr_accessor` method
| * | | Adding missing extension for `cattr_accessor` methodWojciech Wnętrzak2018-03-301-0/+1
|/ / /
* | | Fix intermittent CI failure due to setting explicit `person.id = 10`Ryuta Kamizono2018-03-301-4/+0
| | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/360109429
* | | Merge pull request #32338 from eugeneius/dont_clobber_foreign_keyRyuta Kamizono2018-03-302-2/+4
|\ \ \ | | | | | | | | Don't unset foreign key when preloading missing record
| * | | Don't unset foreign key when preloading missing recordEugene Kenny2018-03-242-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a belongs to association's target is set, its foreign key is now updated to match the new target. This is the correct behaviour when a new record is assigned, but not when the existing record is preloaded. As long as we mark the association as loaded, we can skip setting the target when the record is missing and avoid clobbering the foreign key.
* | | | Short circuit the scoping delegation for `relation.all`Ryuta Kamizono2018-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | Previously `relation.all` behaves as `relation.scoping { klass.all }`. But it is just enough to `relation.spawn`.
* | | | Remove unnecessary line break and quotesyuuji.yaginuma2018-03-301-2/+2
| |_|/ |/| |
* | | Fix "--frozen-lockfile" argument used in yarn install rake taskGuillermo Iguaran2018-03-291-1/+1
| | | | | | | | | --frozen-lockfile is the right name of the argument
* | | Merge pull request #32289 from gsamokovarov/did-you-mean-suggestionsGuillermo Iguaran2018-03-296-57/+14
|\ \ \ | | | | | | | | Use `did_you_mean` spell checker for option suggestions
| * | | Use `did_you_mean` spell checker for option suggestionsGenadi Samokovarov2018-03-236-57/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we require Ruby over `2.3`, we can replace the current suggestion methods we have with tooling from the `did_you_mean` gem. There is a small user visible change and this is that we now offer a single suggestion for misspelled options. We are suggesting fixes during generator invocation and during a mistyped rails server rack handler. In both cases, if we don't make a proper prediction on the first match, we won't do so in the second or third one, so in my mind, this is okay.
* | | Merge pull request #32243 from maschwenk/patch-2Guillermo Iguaran2018-03-291-1/+1
|\ \ \ | | | | | | | | [Webpack] Raise an error when lockfile diff is generated
| * | | Raise an error when lockfile diff is generatedMax Schwenk2018-03-131-1/+1
| | | | | | | | | | | | https://yarnpkg.com/en/docs/cli/install#toc-yarn-install-frozen-lockfile
* | | | Merge pull request #32370 from riseshia/patch-1Andrew White2018-03-291-1/+1
|\ \ \ \ | | | | | | | | | | Compare ruby version with correct way
| * | | | Compare ruby version with correct wayShia2018-03-291-1/+1
|/ / / /
* | | | Merge pull request #30956 from CJStadler/with-lock-changed-deprecationRafael França2018-03-284-1/+24
| | | | | | | | | | | | | | | | Fix deprecation warnings from with_lock
* | | | Bump rack-test to 1.0.0Yuji Yaginuma2018-03-281-1/+1
| | | |
* | | | Merge pull request #32299 from davidstosik/expose-fk-ignore-patternGuillermo Iguaran2018-03-277-3/+43
|\ \ \ \ | | | | | | | | | | Expose foreign key name ignore pattern in configuration
| * | | | Move fk_ignore_pattern from config.active_record to SchemaDumperDavid Stosik2018-03-226-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | This makes more sense, as the foreign key ignore pattern is only used by the schema dumper.
| * | | | Test config.active_record.fk_ignore_patternDavid Stosik2018-03-201-0/+8
| | | | |
| * | | | Document config.active_record.fk_ignore_patternDavid Stosik2018-03-202-0/+10
| | | | |
| * | | | Expose foreign key name ignore pattern in configurationDavid Stosik2018-03-197-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dumping the database schema, Rails will dump foreign key names only if those names were not generate by Rails. Currently this is determined by checking if the foreign key name is `fk_rails_` followed by a 10-character hash. At [Cookpad](https://github.com/cookpad), we use [Departure](https://github.com/departurerb/departure) (Percona's pt-online-schema-change runner for ActiveRecord migrations) to run migrations. Often, `pt-osc` will make a copy of a table in order to run a long migration without blocking it. In this copy process, foreign keys are copied too, but [their name is prefixed with an underscore to prevent name collision ](https://www.percona.com/doc/percona-toolkit/LATEST/pt-online-schema-change.html#cmdoption-pt-online-schema-change-alter-foreign-keys-method). In the process described above, we often end up with a development database that contains foreign keys which name starts with `_fk_rails_`. That name does not match the ignore pattern, so next time Rails dumps the database schema (eg. when running `rake db:migrate`), our `db/schema.rb` file ends up containing those unwanted foreign key names. This also produces an unwanted git diff that we'd prefer not to commit. In this PR, I'd like to suggest a way to expose the foreign key name ignore pattern to the Rails configuration, so that individual projects can decide on a different pattern of foreign keys that will not get their names dumped in `schema.rb`.
* | | | | Merge pull request #32317 from dwightwatson/32247George Claghorn2018-03-263-4/+24
|\ \ \ \ \ | | | | | | | | | | | | Flip the order of the after_create callbacks
| * | | | | Flip the order of the after_create callbacksDwight Watson2018-03-273-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses rails/rails#32247 Add test that checks identify and analyze work in correct order Break out direct upload test helper Review changes for direct-upload test helper
* | | | | | Merge pull request #32185 from nholden/human_readable_date_time_comparisonsRafael França2018-03-269-0/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add `before?` and `after?` methods to date and time classes
| * | | | | | Add `before?` and `after?` methods to date and time classesNick Holden2018-03-069-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Equality comparisons between dates and times can take some extra time to comprehend. I tend to think of a date or time as "before" or "after" another date or time, but I naturally read `<` and `>` as "less than" and "greater than." This change seeks to make date/time comparisons more human readable.
* | | | | | | Merge pull request #32274 from eileencodes/part-1-add-rake-tasks-for-multi-dbEileen M. Uchitelle2018-03-267-22/+283
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Part 1 Easy Multi db in Rails: Add basic rake tasks for multi db setup
| * | | | | | | Refactor configs_for and friendseileencodes2018-03-217-56/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the configs_for and DatabaseConfig struct into it's own file. I was considering doing this in a future refactoring but our set up forced me to move it now. You see there are `mattr_accessor`'s on the Core module that have default settings. For example the `schema_format` defaults to Ruby. So if I call `configs_for` or any methods in the Core module it will reset the `schema_format` to `:ruby`. By moving it to it's own class we can keep the logic contained and avoid this unfortunate issue. The second change here does a double loop over the yaml files. Bear with me... Our tests dictate that we need to load an environment before our rake tasks because we could have something in an environment that the database.yml depends on. There are side-effects to this and I think there's a deeper bug that needs to be fixed but that's for another issue. The gist of the problem is when I was creating the dynamic rake tasks if the yaml that that rake task is calling evaluates code (like erb) that calls the environment configs the code will blow up because the environment is not loaded yet. To avoid this issue we added a new method that simply loads the yaml and does not evaluate the erb or anything in it. We then use that yaml to create the task name. Inside the task name we can then call `load_config` and load the real config to actually call the code internal to the task. I admit, this is gross, but refactoring can't all be pretty all the time and I'm working hard with `@tenderlove` to refactor much more of this code to get to a better place re connection management and rake tasks.
| * | | | | | | Add tests for new rake taskseileencodes2018-03-211-1/+128
| | | | | | | |
| * | | | | | | Update schema/structure dump tasks for multi dbeileencodes2018-03-212-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the ability to dump the schema or structure files for mulitple databases. Loops through the configs for a given env and sets a filename based on the format, then establishes a connection for that config and dumps into the file.
| * | | | | | | Add ability to create/drop/migrate all dbs for a given enveileencodes2018-03-212-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `each_current_configuration` is used by create, drop, and other methods to find the configs for a given environment and returning those to the method calling them. The change here allows for the database commands to operate on all the configs in the environment. Previously we couldn't slice the hashes and iterate over them becasue they could be two tier or could be three tier. By using the database config structs we don't need to care whether we're dealing with a three tier or two tier, we can just parse all the configs based on the environment. This makes it possible for us to run `bin/rails db:create` and it will create all the configs for the dev and test environment ust like it does for a two tier - it creates the db for dev and test. Now `db:create` will create `primary` for dev and test, and `animals` for dev and test if our database.yml looks like: ``` development: primary: etc animals: etc test: primary: etc animals: etc ``` This means that `bin/rails db:create`, `bin/rails db:drop`, and `bin/rails db:migrate` will operate on the dev and test env for both primary and animals ds.
| * | | | | | | Add create/drop/migrate db tasks for each database in the environmenteileencodes2018-03-211-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a three-tier yaml file like this: ``` development: primary: database: "development" animals: database: "development_animals" migrations_paths: "db/animals_migrate" ``` This will add db create/drop/and migrate tasks for each level of the config under that environment. ``` bin/rails db:drop:primary bin/rails db:drop:animals bin/rails db:create:primary bin/rails db:create:animals bin/rails db:migrate:primary bin/rails db:migrate:animals ```
| * | | | | | | Add DatabaseConfig Struct and associated methodseileencodes2018-03-211-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing around and parsing hashes is easy if you know that it's a two tier config and each key will be named after the environment and each value will be the config for that environment key. This falls apart pretty quickly with three-tier configs. We have no idea what the second tier will be named (we know the first is primary but we don't know the second), we have no easy way of figuring out how deep a hash we have without iterating over it, and we'd have to do this a lot throughout the code since it breaks all of Active Record's assumptions regarding configurations. These methods allow us to pass around objects instead. This will allow us to more easily parse the configs for the rake tasks. Evenually I'd like to replace the Active Record connection management that passes around config hashes to use these methods as well but that's much farther down the road. `walk_configs` takes an environment, specification name, and a config and turns them into DatabaseConfig struct objects so we can ask the configs questions like: ``` db_config.spec_name => animals db_config.env_name => development db_config.config { :adapter => mysql etc } ``` `db_configs` loops through all given configurations and returns an array of DatabaseConfig structs for each config in the yaml file. and lastly `configs_for` takes an environment and either returns the spec name and config if a block is given or returns an array of DatabaseConfig structs just for the given environment.
* | | | | | | | Merge pull request #32342 from iorme1/masterRichard Schneeman2018-03-251-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Readability fix [ci skip]
| * | | | | | | | Readability fix [ci skip]Isaac Orme2018-03-251-1/+1
|/ / / / / / / /
* | | | | | | | Make engine check more explicitAndrew White2018-03-251-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not everything that responds to `routes` is a Rails engine - for example a Grape API endpoint will have a `routes` method but can't be used with `assert_recognizes` as it doesn't respond to `recognize_path_with_request`. Fixes #32312.
* | | | | | | | Remove unused `serialize` methodyuuji.yaginuma2018-03-251-4/+0
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #32306 from danhuynhdev/feature/store-accessor-prefixAndrew White2018-03-245-6/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add custom prefix to ActiveRecord::Store accessors
| * | | | | | | Add custom prefix to ActiveRecord::Store accessorsTan Huynh2018-03-235-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a prefix option to ActiveRecord::Store.store_accessor and ActiveRecord::Store.store. This option allows stores to have identical keys with different accessors.
* | | | | | | | Fix that `touch(:updated_at)` causes multiple assignments on the columnRyuta Kamizono2018-03-232-1/+11
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The multiple assignments was caused by 37a1dfa due to lost the `to_s` normalization for given names. Fixes #32323.
* | | | | | | Merge pull request #32315 from huacnlee/fix/local-cache-read-multi-entry-returnRafael França2018-03-222-1/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix Cache `read_multi` with local_cache bug, should returns raw value, not `ActiveSupport::Cache::Entry` instance.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 19:01:35 +0000