aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Update comment in sanitizer helper test [skip ci]Ross Kaffenberger2017-03-291-1/+1
| | |/ / / / | |/| | | | | | | | | | The previously referenced file no longer appears to exist in the project.
* | | | | | Merge pull request #28417 from schneems/schneems/symlink-failuresAndrew White2017-03-302-1/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Raise when using a bad symlink
| * | | | | Raise when using a bad symlinkschneems2017-03-142-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a case where a dev made a symlink that worked on some machines and not on others. The issue manifested itself on a machine with `RAILS_ENV=staging` as the had their `config/environments/staging.rb` symlinked to another config file. The behavior was very hard to track down. Current behavior: If you use a bad symlink in a file, you get no warnings or failures or anything. If you have a bad symlink it just ignores the file as if it didn't exist (`File.exist?` returns false for a bad symlink). Patch behavior: With this patch when a file is not present we check if a symlink exists. If it does, that indicates there is a bad symlink and we should raise ``` File "config/environments/staging.rb" is a symlink that does not point to a valid file ```
* | | | | | Merge pull request #28603 from mikeastock/alias-reverse-mergeSean Griffin2017-03-295-0/+47
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add an alias for reverse_merge to with_defaults
| * | | | | Add aliases for reverse_merge to with_defaultsMatt Casper2017-03-295-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the context of controller parameters, reverse_merge is commonly used to provide defaults for user input. Having an alias to reverse_merge called with_defaults feels more idiomatic for Rails.
* | | | | | Small grammar fixJon Moss2017-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add comma and change verb. [ci skip]
* | | | | | Merge pull request #28595 from 3wille/fw-after-action-hintRafael França2017-03-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | add hint on after_action filters
| * | | | | | add hint on after_action filtersFrederik Wille2017-03-291-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a hint that ``after_action``-callbacks are not executed when an exception was raised in the rest of the request cycle. The ``before_action`` section mentions "If there are additional filters scheduled to run after that filter, they are also cancelled." but this is IMO not sufficient.
* | | | | | Merge pull request #28592 from ↵Rafael França2017-03-293-1/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | htanata/ar_relation_inspect_should_not_load_all_records Load only needed records on ActiveRecord::Relation#inspect
| * | | | | | Load only needed records on ActiveRecord::Relation#inspectHendy Tanata2017-03-283-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of loading all records and returning only a subset of those, just load the records as needed. Fixes #25537.
* | | | | | | Merge pull request #28602 from tricknotes/fix-rails-groups-exampleRafael França2017-03-291-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix the example code for `Rails.groups` [ci skip]
| * | | | | | | Fix the example code for `Rails.groups` [ci skip]Ryunosuke Sato2017-03-301-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | `Rails.groups` contains `Rails.env` that is inspected as String.
* | | | | | | Merge pull request #28600 from tricknotes/ruby-2.2.7Rafael França2017-03-291-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | CI against Ruby 2.2.7
| * | | | | | | CI against Ruby 2.2.7Ryunosuke Sato2017-03-301-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | https://www.ruby-lang.org/en/news/2017/03/28/ruby-2-2-7-released/
* | | | | | | Add test to make sure subclasses also get helpersRafael Mendonça França2017-03-291-0/+16
| | | | | | |
* | | | | | | Merge pull request #28598 from wnadeau/patch-1Rafael França2017-03-291-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | FinderMethods#fourty_two docs cite proper source
| * | | | | | | FinderMethods#fourty_two docs cite proper sourceWinfred Nadeau2017-03-291-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | silly method gets a silly doc fix, or I'm missing an even sillier joke and I'm about to get schooled. BUT I'm pretty sure this is some serious Beaudrillard simulacrum, though. I'm just doing my part to spread the gospel of Douglas Adams.
* | | | | | | Merge pull request #28601 from tricknotes/fix-link-to-rails-ujsRafael França2017-03-295-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix link to rails-ujs
| * | | | | | | Fix link to rails-ujsRyunosuke Sato2017-03-305-5/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails-ujs is merged into actionview in favor of https://github.com/rails/rails/pull/28098. [skip ci]
* / / / / / / Configure the days until close a stale issueRafael França2017-03-291-1/+3
|/ / / / / / | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #28478 from kamipo/fix_primary_keys_across_multiple_schemasAndrew White2017-03-292-10/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `primary_keys` across multiple schemas
| * | | | | | Fix `primary_keys` across multiple schemasRyuta Kamizono2017-03-202-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #28470.
* | | | | | | Remove CHANGELOG.md entry that appears in 5-1-stableJon Moss2017-03-291-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CHANGELOG.md is a continuation of the 5-1-stable one, there shouldn't be any duplicate entries. [ci skip]
* | | | | | | Merge pull request #28586 from mtsmfm/override-driverEileen M. Uchitelle2017-03-292-6/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make `driven_by` overridable
| * | | | | | | Make `driven_by` overridableFumiaki MATSUSHIMA2017-03-292-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes we want to use rack_test partially instead of selenium for test speed: ```ruby class ApplicationSystemTestCase < ActionDispatch::SystemTestCase driven_by :selenium, using: :chrome, screen_size: [1400, 1400], options: {url: "http://chrome:4444/wd/hub"} end class WithJavaScriptTest < ApplicationSystemTestCase end class WithoutJavaScriptTest < ApplicationSystemTestCase driven_by :rack_test end ``` In the abobe case, `WithoutJavaScriptTest` uses selenium because `SystemTestCase` calls superclass' driver on `#initialize` (`self.class.superclass.driver.use`). Using `class_attribute` can handle inherited `driven_by`.
* | | | | | | | Merge pull request #28590 from y-yagi/remove_unnecessary_javascript_option_checkAndrew White2017-03-291-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Remove unnecessary `javascript` option check
| * | | | | | | Remove unnecessary `javascript` option checkyuuji.yaginuma2017-03-291-4/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Follow up to #28546
* | | | | | | Merge pull request #28052 from kamipo/make_internal_methods_to_privateRafael França2017-03-2812-185/+181
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make internal methods to private
| * | | | | | | Make internal methods to privateRyuta Kamizono2017-03-2712-185/+181
| | | | | | | |
* | | | | | | | Use keyword arguments instead of hashRafael Mendonça França2017-03-282-9/+11
| | | | | | | |
* | | | | | | | Merge pull request #28480 from ↵Rafael Mendonça França2017-03-285-21/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mubashirhanif/add_keep_id_suffix_option_to_humanize_new Add keep id suffix option to humanize new
| * | | | | | | | Added options hash to titleize method and keep_id_suffix option to humanizeMubashir Hanif2017-03-215-21/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some documentation remove extra whitespace. Added id in the middle test case and corrected some testcases. Some Coding standard guidelines corrections as suggested by codeclimate. Some more corrections suggested by codeclimate.
* | | | | | | | | starts_with? is removed in Ruby 2.4Rafael Mendonça França2017-03-281-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #1 from radiospiel/tickets/26955-listen-pathsRafael Mendonça França2017-03-281-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | No longer listens to dirs outside of the app directory.
| * | | | | | | | No longer listens to dirs inside of installed gemseno2016-11-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails5 uses the listen gem to watch for changes from autoload directories and from i18n directories. Changes there would be reflected by the running app, in development mode usually. However, files outside of the application directory or locally installed gems should not change during development, and rails does not need to reflect changes there if they do. This change makes sure only those paths that do not originate from the app itself are watched. This can help especially with the situation on OSX, where rb-fsevent - which implements file watching - is quite a resource hog.
* | | | | | | | | Merge pull request #28584 from bogdanvlviv/errors-keys-values-fixRafael França2017-03-283-11/+52
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix ActiveModel::Errors #keys, #values
| * | | | | | | | | Fix ActiveModel::Errors #keys, #valuesbogdanvlviv2017-03-283-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: person.errors.keys # => [] person.errors.values # => [] person.errors[:name] # => [] person.errors.keys # => [:name] person.errors.values # => [[]] After: person.errors.keys # => [] person.errors.values # => [] person.errors[:name] # => [] person.errors.keys # => [] person.errors.values # => [] Related to #23468
* | | | | | | | | | Merge pull request #28514 from y-yagi/follow_up_to_28056Andrew White2017-03-281-8/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix store accessors in parameters test
| * | | | | | | | | | Fix store accessors in parameters testyuuji.yaginuma2017-03-221-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The method name must be `stored_attributes`, not `stores_attributes`. * `attribute_names` must return a non-empty value. Because `stored_attributes` is not checked if `attribute_names` is empty. Follow up to #28056
* | | | | | | | | | | Merge pull request #28549 from jess/patch-1Rafael França2017-03-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | make it clear how to enable caching
| * | | | | | | | | | add proper punctuationJess Brown2017-03-231-1/+1
| | | | | | | | | | |
| * | | | | | | | | | make it clear how to enable cachingJess Brown2017-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since this is a new change, many will be coming here to toggle the true/false config and not find it. This will allow them to quickly implement the change.
* | | | | | | | | | | Return unmapped timezones from `country_zones`Andrew White2017-03-282-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a country doesn't exist in the MAPPINGS hash then create a new `ActiveSupport::Timezone` instance using the supplied timezone id. Fixes #28431.
* | | | | | | | | | | No need to duplicate 5-1-stable CHANGELOG. [ci skip]Yves Senn2017-03-281-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `master` changelog refer back to the `5-1-stable` changelog as a base. No need to duplicate backported entries in the changelogs on `master`.
* | | | | | | | | | | Fix the tests to test what they should be testingRafael Mendonça França2017-03-271-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Rack::Test the headers needs to match the `HTTP_` format. The tests were passing before because they are not asserting the response was a cache hit.
* | | | | | | | | | | Make sure that ActionController::Api can include helpersRafael Mendonça França2017-03-271-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28554
* | | | | | | | | | | Merge pull request #28557 from ↵Rafael França2017-03-273-1/+56
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_unnecessary_files_to_api_applications_when_app_task_task_executed Remove unnecessary files to API-only Applications when `app:task` task executed
| * | | | | | | | | | | Remove unnecessary files to API-only Applications when `app:task` task executedyuuji.yaginuma2017-03-243-1/+56
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #28546 from claudiob/drop-j-optionRafael Mendonça França2017-03-272-16/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove -j (--javascript) option from `rails new`
| * | | | | | | | | | | | Remove -j (--javascript) option from `rails new`claudiob2017-03-233-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "-j" option was added 5 years ago (https://github.com/rails/rails/commit/d9c39c3a) when we wanted to support prototype-rails and jquery-rails. Prototype is not as popular and jQuery is not a requirement anymore. Still the "-j" option can be used to install *any* gem that ends in "-rails". This "might" open security issues and does not bring great benefits anymore. If you know which "-rails"-ending gem you want to install, you can manually add it to the Gemfile just like any other gem.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 20:55:13 +0000