aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #33318 from ↵Kasper Timm Hansen2018-07-082-0/+28
|\ | | | | | | | | lxxxvi/multiple_expressions_in_assert_no_difference Documentation and some tests for `assert_no_difference`
| * added tests for assert_no_difference with multiple expressionslxxxvi2018-07-082-0/+28
| |
* | Merge pull request #33317 from ↵Kasper Timm Hansen2018-07-085-23/+23
|\ \ | | | | | | | | | | | | bogdanvlviv/has_secure_password-use-recovery_password-instead-of-activation_token has_secure_password: use `recovery_password` instead of `activation_token`
| * | has_secure_password: use `recovery_password` instead of `activation_token`bogdanvlviv2018-07-085-23/+23
|/ / | | | | | | | | | | Since we have `has_secure_token`, it is too confusing to use `_token` suffix with `has_secure_password`. Context https://github.com/rails/rails/pull/33307#discussion_r200807185
* | Store newly-uploaded files on save rather than assignmentGeorge Claghorn2018-07-0722-679/+1049
| |
* | Merge pull request #33307 from ↵Ryuta Kamizono2018-07-082-9/+28
|\ \ | | | | | | | | | | | | bogdanvlviv/improve-docs-test-of-has_secure_password Improve docs/test of `has_secure_password`
| * | Improve `SecurePasswordTest#test_authenticate`bogdanvlviv2018-07-061-4/+7
| | | | | | | | | | | | | | | | | | - Ensure that execution of `authenticate`/`authenticate_XXX` returns `self` if password is correct, otherwise `false` (as mentioned in the documentation). - Test `authenticate_password`.
| * | Update `has_secure_password` info in the guidebogdanvlviv2018-07-061-5/+21
| | | | | | | | | | | | | | | `has_secure_password` allows configuring name of attribute since #26764. This commit adds a mention about it in the Active Model Basics Guide.
* | | Fix that models can clobber each others' attachment reflectionsGeorge Claghorn2018-07-073-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the following model definitions: class User < ApplicationRecord has_one_attached :avatar end class Group < ApplicationRecord has_one_attached :avatar end If you attempt to reflect on the User model's avatar attachment via User.reflect_on_attachment, you could receive a reflection for the Group model's avatar attachment. Fix this by ensuring that each model class uses its own Hash object to track attachment reflections.
* | | Merge pull request #32986 from kevgathuku/patch-1Ryuta Kamizono2018-07-081-0/+3
|\ \ \ | |_|/ |/| | | | | | | | Specify location for engine-specific commands [ci skip]
| * | Specify location for engine-specific commandsKevin Ndung'u Gathuku2018-07-041-0/+3
| | | | | | | | | | | | | | | | | | Be more specific when pointing out where the commands relating to the engine should be run [ci skip]
* | | Don't balloon @original_options with --restart on restart.Kasper Timm Hansen2018-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Our restart_command would pass in `--restart` which means that if the @original_options already contains --restart it would keep getting another --restart appended. Nothing here that would break the bank, but just a nicety.
* | | Don't show unneeded deprecation warning on server restart.Kasper Timm Hansen2018-07-072-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If booting a server via `rails s -u puma`, we'd convert the option to a `using` positional. When using `rails restart` our `restart_command` would the option converted to the using positional and put that in the restart command. Thus we'd show users deprecation warnings for our own code. Fix that by converting a passed positional to an option instead. Also: fix initialize method signature. The local_options are an array, not a hash. But don't even bother assigning defaults as Thor passes them in.
* | | Remove restart_command leftover from switching to Thor options.Kasper Timm Hansen2018-07-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref: https://github.com/rails/rails/commit/654704247eba742e139cfaa8d1385f13605d9e12 Before the commit we had a restart_command in Rails::Server. But after there's another one in Rails::ServerCommand. The command version of the method is the right one as it's used in server_options. Give the leftover method the boot.
* | | Use only snake cased symbols in commands.Kasper Timm Hansen2018-07-071-5/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mixing strings and symbols seems aesthetically less than ideal. We can also use underscores just fine. Thor converts them to dashes for the CLI and it makes access in Ruby code nicer. Here's the `server --help` output after this change: ``` Usage: rails server [thin/puma/webrick] [options] Options: -p, [--port=port] # Runs Rails on the specified port - defaults to 3000. -b, [--binding=IP] # Binds Rails to the specified IP - defaults to 'localhost' in development and '0.0.0.0' in other environments'. -c, [--config=file] # Uses a custom rackup configuration. # Default: config.ru -d, [--daemon], [--no-daemon] # Runs server as a Daemon. -e, [--environment=name] # Specifies the environment to run this server under (development/test/production). -u, [--using=name] # Specifies the Rack server used to run the application (thin/puma/webrick). -P, [--pid=PID] # Specifies the PID file. # Default: tmp/pids/server.pid -C, [--dev-caching], [--no-dev-caching] # Specifies whether to perform caching in development. [--early-hints], [--no-early-hints] # Enables HTTP/2 early hints. ``` See? Quite dashing ✨
* | Pass along arguments to underlying `get` method in `follow_redirect!` (#33299)Remo Fritzsche2018-07-053-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow get arguments for follow_redirect Now all arguments passed to `follow_redirect!` are passed to the underlying `get` method. This for example allows to set custom headers for the redirection request to the server. This is especially useful for setting headers that may, outside of the testing environment, be set automatically on every request, i.e. by a web application firewall. * Allow get arguments for follow_redirect [Remo Fritzsche + Rafael Mendonça França]
* | Merge pull request #32776 from Edouard-chin/ec-as-hooksKasper Timm Hansen2018-07-051-10/+11
|\ \ | | | | | | Use testing lazy-load hooks
| * | Use testing lazy-load hooks:Edouard CHIN2018-07-041-10/+11
| | | | | | | | | | | | - In order to avoid loading classes prematurely, let's use lazy load hooks that are now provided with each test case
* | | Merge pull request #33298 from anniecodes/notes-command-testKasper Timm Hansen2018-07-051-12/+12
|\ \ \ | | | | | | | | Make NotesCommand tests more performant by getting rid of unnecessary map
| * | | Make NotesCommand tests more performant by getting rid of unecessary mapAnnie-Claude Côté2018-07-051-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Get rid of map and replace it with a multiplication of "\n" to generate document with multiple line preceding the annotation * Reduce number from 1000 to 100 since it achieves the same goal * Only keep one test for the multiple lines document since it's unecessary to test multiple times * Update some language in tests names to make it clearer what we are testing
* | | | Merge pull request #33297 from claudiob/shorter-attribute_previous_changeKasper Timm Hansen2018-07-051-1/+1
|\ \ \ \ | |/ / / |/| | | Shorter code: remove unnecessary condition
| * | | Shorter code: remove unnecessary conditionclaudiob2018-07-051-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/136fc65c9b8b66e1fb56f3a17f0d1fddff9b4bd0#r28897107 I _think_ that this method can now be rewritten from: ```ruby def attribute_previous_change(attr) previous_changes[attr] if attribute_previously_changed?(attr) end ``` to: ```ruby def attribute_previous_change(attr) previous_changes[attr] end ``` without losing performance. --- Calling ```ruby previous_changes[attr] if attribute_previously_changed?(attr) ``` is equivalent to calling ```ruby previous_changes[attr] if previous_changes.include?(attr) ``` When this commit 136fc65c9b was made, Active Record had its own `previous_changes` method, added here below. However, that method has been recently removed from the codebase, so `previous_changes` is now only the method defined in Active Model as: ```ruby def previous_changes @previously_changed ||= ActiveSupport::HashWithIndifferentAccess.new @previously_changed.merge(mutations_before_last_save.changes) end ``` Since we are dealing with a memoized Hash, there is probably no need to check `if .include?(attr_name)` before trying to fetch `[attr]` for it. Does that make sense? Did I miss anything? Thanks!
* | | Merge pull request #33220 from anniecodes/notes-commandKasper Timm Hansen2018-07-055-46/+237
|\ \ \ | | | | | | | | Adds `Rails::Command::NotesCommand` and makes `rake notes` use it under the hood
| * | | Port Annotations rake task to use Rails::NotesCommandAnnie-Claude Côté2018-07-042-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Invokes the notes Rails::Command and passes the rake task ENV variables as annotations options to it * Adds a deprecation warning for unsupported commands * Gets rid of reference to ENV["SOURCE_ANNOTATION_DIRECTORIES"] in SourceAnnotationExtractor since its now dealt with in the NotesCommand * Gets rid of rake desc for each rake notes task so they are not documented while using `rails -T` or `rails --help`
| * | | Adds support to register directories and extensions to NotesCommandAnnie-Claude Côté2018-07-042-0/+46
| | | | | | | | | | | | | | | | | | | | * Require the application and environnement in the notes command in order to load the config files * Adds tests for both register_directories and register_extensions added to a config file
| * | | Adds a Rails::Command for NotesAnnie-Claude Côté2018-07-042-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It is called with `rails notes` * It defaults to displaying [OPTIMIZE, FIXME and TODO] annotations * It accepts custom annotations by using `rails notes -a CUSTOM_ANNOTATION OTHER_ANNOTATION` * It defaults to look for annotations in [app config db lib test] as dictated by SourceAnnotationExtractor * It supports ENV["SOURCE_ANNOTATION_DIRECTORIES"] but adds a deprecation warning and recommends using register_directories instead
| * | | [ci skip] Update documentation related to `rails notes`Annie-Claude Côté2018-07-032-39/+56
| | | | | | | | | | | | | | | | | | | | | | | | * Get rid of references to rake notes in the documentation * Get rid of references to environement variables used in SourceAnnotationExtractor * Updates the command line guide to reflect the new rails notes API
* | | | Merge pull request #33294 from bibstha/remove_unnecessary_require_on_gcs_serviceGeorge Claghorn2018-07-041-1/+0
|\ \ \ \ | |_|/ / |/| | | Remove vestigial require on ActiveStorage GCSService
| * | | Remove vestigial require on ActiveStorage GCSServiceBibek Shrestha2018-07-041-1/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file `filename.rb` as mentioned in `require "active_storage/filename"` belongs to the `app` folder while GCSService belongs to the lib folder. Looking at the git blame, it was added in commit https://github.com/rails/rails/commit/ccac681122db9747fec9512076772bca345e24b9#diff-bda6a610ef1575b2c8458c96b7f12578 where ActiveStorage::Filename was actually used. But it is no longer required on master and therefore can be removed. This allows anyone to use GCSService directly without enabling ActiveStorage engine.
* | | Merge pull request #33288 from ioquatix/patch-2Rafael França2018-07-041-2/+4
|\ \ \ | | | | | | | | Better compatibility with SPEC.
| * | | Better compatibility with SPEC.Samuel Williams2018-07-041-2/+4
| | |/ | |/| | | | | | | | | | | | | If `env` is duped or otherwise not the same as the original `env` that was generated at the top of rack middleware, it is impossible for the server hijack proc to update the right `env` instance. Therefore, capturing the return value is more reliable. This is the recommendation of the rack SPEC.
* | | A Class is a Module so we remove one conditionalRafael Mendonça França2018-07-041-1/+1
| | |
* | | Merge pull request #33289 from Edouard-chin/ec-lazy-load-hooksRafael França2018-07-042-1/+54
|\ \ \ | |/ / |/| | Use class_eval or instance_eval when triggering lazy load hooks
| * | Use class_eval or instance_eval when triggering lazy load hooks:Edouard CHIN2018-07-032-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When lazy load hooks were triggered we were using `Object.instance_eval` which evaluates the block in the context of the class being passed. Most of the time that class was a `Class`. If one wants to define a instance method on the class then it wasn't possible. ```ruby class A; end; A.instance_eval do def foo puts 'bar' end end A.new.foo #> NoMethodError: undefined method `foo` A.foo #> bar ``` - This PR checks what object is passed when triggering the hooks and either call `class_eval` or `instance_eval`. My rational and assumptions being that if an instance of a class is passed, then the blocks needs to evaluate in the context of that instance (i.e. defining a method should only define it on that instance). On the other hand, if a Class or Module is passed when triggering hooks, then defining a method should define it on the class itself - #32776 Pushed me to introduce this change
* | | Merge pull request #33286 from ph3t/add-changelog-entry-for-42c3537Ryuta Kamizono2018-07-041-1/+13
|\ \ \ | | | | | | | | | | | | Add changelog entry for 42c3537 [ci skip]
| * | | Add changelog entry for 42c3537 [ci skip]Juan Broullon2018-07-031-1/+11
| | | |
* | | | Merge pull request #33287 from albertoalmagro/remove-old-todo-generatorRyuta Kamizono2018-07-041-1/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Remove old TODO comment [ci skip]
| * | | Remove old TODO commentAlberto Almagro2018-07-041-1/+0
|/ / / | | | | | | | | | | | | This TODO comment has been here more than 7 years and doesn't seem to be a temporary implementation anymore.
* | | Merge pull request #33054 from jboler/masterRafael França2018-07-033-20/+5
|\ \ \ | | | | | | | | Fix route eager loading
| * | | Only execute route updater once on app bootJonathan Boler2018-06-192-6/+2
| | | |
| * | | Merge branch 'master' of github.com:rails/railsJonathan Boler2018-06-0425-68/+231
| |\ \ \
| * | | | Eager load routes on rebuildJonathan Boler2018-06-041-14/+2
| | | | |
| * | | | Only build routes simulator when there is an ASTJonathan Boler2018-06-041-0/+1
| | | | |
* | | | | Merge pull request #33282 from alpaca-tc/remove_unnecessary_dependentsRafael França2018-07-032-2/+0
|\ \ \ \ \ | | | | | | | | | | | | ActiveJob::Base no longer dependents on ActiveJob::Serializers
| * | | | | ActiveJob::Base no longer dependents on Serializersalpaca-tc2018-07-032-2/+0
| | | | | |
* | | | | | Merge pull request #32361 from ph3t/safe-html-translation-arraysKasper Timm Hansen2018-07-032-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add safe html support to arrays of translations
| * | | | | | Add safe html support to arrays of translationsJuan Broullon2018-07-032-4/+10
| | | | | | |
* | | | | | | Merge pull request #33208 from utilum/bump_sprocketsEileen M. Uchitelle2018-07-031-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Update sprockets to Security release for CVE-2018-3760
| * | | | | | Update sprockets to Security release for CVE-2018-3760utilum2018-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: https://github.com/rails/sprockets/blob/v3.7.2/CHANGELOG.md https://github.com/rails/sprockets/commit/9c34fa05900b968d74f08ccf40917848a7be9441
* | | | | | | Use `construct_join_dependency` in all placesRyuta Kamizono2018-07-033-13/+6
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 23:00:37 +0000