aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Fix `thoughtbot` capitalizationTeo Ljungberg2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The company name is spelled `thoughtbot` per https://github.com/thoughtbot/presskit/blob/master/README.md#name
* | | | | | | Merge pull request #20429 from repinel/improve-bug-report-templateRafael Mendonça França2015-06-043-33/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Use inline Gemfile dependency when reporting bugs
| * | | | | | | Use inline Gemfile dependency when reporting bugsRoque Pinel2015-06-033-33/+18
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | With Bundler `1.10.3`, it is possible to list the gems inline without the need to create a `Gemfile` if none is found in the current directory.
* | | | | | | Merge pull request #20439 from jimmycuadra/require-as-durationArthur Nogueira Neves2015-06-041-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Require active_support/duration.
| * | | | | | | Require active_support/duration.Jimmy Cuadra2015-06-041-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::TimeWithZone references `ActiveSupport::Duration` but does not require it, which can result in a `LoadError` when required directly without requiring a component less granular like `active_support/time`, where the autoload for `ActiveSupport::Duration` is set up.
* | | | | | | Merge pull request #20427 from ronakjangir47/http_pathYves Senn2015-06-041-9/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removed duplicate test cases for template execution
| * | | | | | | Removed duplicate test cases for template execution Ronak Jangir2015-06-041-9/+0
| |/ / / / / /
* | | | | | | Merge pull request #20430 from georgeclaghorn/tighten-up-suppressionRafael Mendonça França2015-06-042-3/+33
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Apply Active Record suppression to all saves
| * | | | | | Apply Active Record suppression to all savesGeorge Claghorn2015-06-042-3/+33
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was not being applied to creates and updates attempted through the non-bang save methods. This means that, for example, creation of records for singular associations through the `create_*` methods was not appropriately ignored in .suppress blocks.
* | | | | | Document config.action_mailer.deliver_later_queue_nameRafael Mendonça França2015-06-032-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a CHANGELOG entry for #18587 [ci skip]
* | | | | | Merge pull request #18587 from ↵Rafael Mendonça França2015-06-035-1/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | chrismcg/allow_deliver_later_queue_name_to_be_configured Allow configuration of ActionMailer queue name
| * | | | | Allow configuration of ActionMailer queue nameChris McGrath2015-06-025-1/+33
| | | | | |
* | | | | | pass check_ip and proxies to GetIp constructorAaron Patterson2015-06-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `GetIp` class doesn't need to keep a reference to the middleware, so there is no reason to pass the middleware instance to the `GetIp` class
* | | | | | Merge pull request #20421 from repinel/fix-clear-guides-and-related-api-docsRafael Mendonça França2015-06-032-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] fix the `collection.clear` guide
| * | | | | | [ci skip] fix the `collection.clear` guideRoque Pinel2015-06-022-8/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the guide about `has_many` `collection.clear` to indicate the behavior for each dependent strategy according to `collection.delete_all`. Based on #17179, I changed the `collection.delete` docs to also clarify the default strategy for each `hm` and `hm:t` associations. Fixes #20170.
* | | | | | Revert "Merge pull request #19685 from vngrs/actionview_parent_layout_bug"Rafael Mendonça França2015-06-022-31/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a9d58c77da800bb0052c9bfa432828b02526022c, reversing changes made to 041c2c879a3c4086ad3aa6d30fed1eede1d53c11. Reason: The old behavior is how it was working in previous version of Rails since 4.0.x so it is not safe to backport to a stable branch. See https://github.com/rails/rails/issues/19626#issuecomment-89862258 and https://github.com/rails/rails/pull/15050#issuecomment-45333449
* | | | | | Merge pull request #20383 from jonatack/fix-configurable-static-index-filenameSantiago Pastorino2015-06-021-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix regression in #20017 wrong number of arguments error
| * | | | | | Fix regression in #20017: wrong number of arguments errorJon Atack2015-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and use coherent quoting/spacing. This should hopefully fix a regression that was introduced with #20017, causing deployment pushes to Heroku to be rejected with the following trace: ArgumentError: wrong number of arguments (2 for 3) remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tatic.rb:16:in `initialize' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in `new' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in `initialize' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:43:in `new' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:43:in `build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `block in build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `each' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `inject' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s tack.rb:118:in `build' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/engine.rb:509:in `app' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application/finisher.rb: 34:in `block in <module:Finisher>' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in `instance_exec' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in `run' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:55:in `block in run_initializers' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:54:in `run_initializers' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application.rb:352:in `initialize!' remote: /tmp/build_a3b8845b716508af12d99859d1a58c5c/config/environment.rb:5:in `<top (required)>'
* | | | | | | Merge pull request #20387 from y-yagi/fix_engine_generated_controller_testYves Senn2015-06-026-1/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | set engine's route in the functional test is generated in the engine
| * | | | | | | add test to run generated test files inside mountable engineyuuji.yaginuma2015-06-023-16/+25
| | | | | | | |
| * | | | | | | add engine's namespace to fixture nameyuuji.yaginuma2015-05-313-1/+11
| | | | | | | |
| * | | | | | | set engine's route in the functional test is generated in the engineyuuji.yaginuma2015-05-313-0/+24
| | | | | | | |
* | | | | | | | Skip test that fails from outdated sqlite3 on travisSean Griffin2015-06-022-10/+9
| | | | | | | |
* | | | | | | | Merge pull request #20413 from kddeisz/pluck_postgres_fixYves Senn2015-06-021-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix postgresql DISTINCT requirement in pluck test
| * | | | | | | | Fix postgresql DISTINCT requirement in pluck testKevin Deisz2015-06-021-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #20410 from schneems/schneems/boo-global-varsRafael Mendonça França2015-06-013-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use block variable instead of global
| * | | | | | | | Use block variable instead of globalschneems2015-06-013-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby require 'benchmark/ips' Benchmark.ips do |x| x.report("$&") { "foo".sub(/f/) { $&.upcase } } x.report("block var") { "foo".sub(/f/) {|match| match.upcase } } end ``` ``` Calculating ------------------------------------- $& 48.658k i/100ms block var 49.666k i/100ms ------------------------------------------------- $& 873.156k (± 9.3%) i/s - 4.331M block var 969.744k (± 9.2%) i/s - 4.818M ``` It's faster, and gets rid of a few "magic" global variables
* | | | | | | | | Merge pull request #20409 from davydovanton/doc-queue-adapterAbdelkader Boudih2015-06-021-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add documentation for QueueAdapter::queue_adapter
| * | | | | | | | | [skip ci] Add documentation for QueueAdapter::queue_adapterAnton Davydov2015-06-021-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20357 from ronakjangir47/remove_mocha1Rafael Mendonça França2015-06-011-27/+52
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removed use of mocha from railties actions_test
| * | | | | | | | | Removed use of mocha from railties actions_testRonak Jangir2015-06-011-27/+52
| | | | | | | | | |
* | | | | | | | | | Merge pull request #20406 from yoongkang/add_edge_sprocketsSantiago Pastorino2015-06-011-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use sprockets-rails from github repo
| * | | | | | | | | | Use sprockets-rails from github repoYoong Kang Lim2015-06-021-0/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #20397
* | | | | | | | | | Merge pull request #20405 from manish-shrivastava/masterRafael Mendonça França2015-06-015-5/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed typos in rails guide
| * | | | | | | | | | Fixed typos in guidemanish-shrivastava2015-06-015-5/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #19094 from phoet/have_bearer_be_valid_as_wellRafael Mendonça França2015-06-013-2/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Have Bearer be valid as well
| * | | | | | | | | | | add changelog entryphoet2015-06-011-0/+10
| | | | | | | | | | | |
| * | | | | | | | | | | allow `Bearer` as well as `Token`phoet2015-06-012-1/+8
| | | | | | | | | | | |
| * | | | | | | | | | | actually test what the name saysphoet2015-06-011-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #20362 from kddeisz/enumerable_pluckRafael Mendonça França2015-06-014-2/+43
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Allow Enumerable#pluck to take a splat.
| * | | | | | | | | | Allow Enumerable#pluck to take a splat.Kevin Deisz2015-05-294-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows easier integration with ActiveRecord, such that AR#pluck will now use Enumerable#pluck if the relation is loaded, without needing to hit the database.
* | | | | | | | | | | Merge pull request #20138 from tgxworld/deprecated_assert_templateRafael Mendonça França2015-06-0126-880/+166
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Deprecate `assert_template` and `assigns()`.
| * | | | | | | | | | | Remove `assigns` and `assert_template`.Guo Xiang Tan2015-05-3026-880/+166
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #20284 from kaspth/fix-caching-testRafael Mendonça França2015-06-013-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Move expectation to instance level.
| * | | | | | | | | | | | Replace expectation with state check.Kasper Timm Hansen2015-05-303-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests would still pass if the cache call in the rendered templates were removed.
* | | | | | | | | | | | | Merge pull request #20398 from nkondratyev/fix-time-changeRafael Mendonça França2015-06-013-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a range of values for parameters of the Time#change
| * | | | | | | | | | | | | Fix a range of values for parameters of the Time#changeNikolay Kondratyev2015-06-013-1/+9
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing 999999000 < `:nsec` < 999999999 and 999999 < `:usec` < 1000000 to change a time with utc_offset doesn't throw an `ArgumentError`.
* | | | | | | | | | | | | Merge pull request #20386 from yoongkang/circular_importRafael Mendonça França2015-06-011-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix circular import warning on build
| * | | | | | | | | | | | | Fix circular import warning on buildYoong Kang Lim2015-05-311-1/+0
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #20401 from yahonda/master_bigint_as_limit_19_in_oracleRafael Mendonça França2015-06-012-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map :bigint as NUMBER(19) sql_type by using `:limit => 19` for Oracle
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 12:50:53 +0000