aboutsummaryrefslogtreecommitdiffstats
path: root/railties
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 #17348 from DavidGeukers/rake_test_allDavid Heinemeier Hansson2014-11-122-3/+26
|\ \ | |/ |/| simplify rake test vs rake test:all
| * Simplify rake test vs rake test:allDavid Geukers2014-11-102-3/+26
| | | | | | | | 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`
* | 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__) ```
* | :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-106-15/+172
|\ \ | | | | | | | | | 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-026-15/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `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_/'
* | | added description for rails generators, and fixed sentence formation for ↵Rishi Jain2014-11-102-0/+4
| | | | | | | | | | | | active_support/notifications [ci skip]
* | | 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
| | |
* | | Add test/jobs files in `rake stats`Arun Agrawal2014-11-052-1/+3
| | |
* | | Add skip-turbolinks entry to 4.2 release notes and improve changelogCarlos Antonio da Silva2014-11-051-1/+1
| | | | | | | | | | | | [ci skip]
* | | add lib to $LOAD_PATH on application inhertence. fixes #17106Aaron Patterson2014-11-043-9/+16
| | |
* | | add a test for #17106Aaron Patterson2014-11-042-0/+22
| | |
* | | Revert "Replace String index juggling with Pathname goodness in ↵yuuji.yaginuma2014-11-021-0/+10
|/ / | | | | | | | | | | | | | | db:fixtures:load" This reverts commit 482fdad5ef8a73688b50bba3991dd4ef6f286edd. Fixes #17237.
* | Prepare for 4.2.0.beta4 releaseGodfrey Chan2014-10-301-1/+1
| |
* | On larger screens the email preview iframe is being limited to a height of ↵Edwin Wills2014-10-291-1/+4
| | | | | | | | 800 pixels, and the full available screen size is not being used.
* | Merge pull request #17423 from lukefx/jruby_windows_tzinfoSantiago Pastorino2014-10-291-2/+2
|\ \ | | | | | | Added 'tzinfo-data' if we are using jruby
| * | Added 'tzinfo-data' if we are using jrubyLuca Simone2014-10-291-2/+2
| | |
* | | edit pass over all warningsXavier Noria2014-10-281-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uniformizes warning messages. I used the most common style already present in the code base: * Capitalize the first word. * End the message with a full stop. * "Rails 5" instead of "Rails 5.0". * Backticks for method names and inline code. Also, converted a few long strings into the new heredoc convention.
* | Merge pull request #17408 from bf4/fix_rbx_testYves Senn2014-10-281-1/+1
|\ \ | | | | | | Fix rbx generated Gemfile regex
| * | Fix rbx generated Gemfile regexBenjamin Fleischer2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/39190983#L460 1) Failure: AppGeneratorTest#test_psych_gem [test/generators/app_generator_test.rb:495]: Expected /gem 'psych',\s+'~> 2.0', \s+platforms: :rbx/ to match <snip> http://git.io/uuLVag)\ngem 'psych', '~> 2.0', platforms: :rbx\n\n
* | | Merge pull request #16229 from byroot/stop-swallowing-url-generation-errorsAndrew White2014-10-271-0/+15
|\ \ \ | |/ / |/| | UrlGenerationError are not catched as 404 anymore
| * | UrlGenerationError are not catched as 404 anymoreJean Boussier2014-10-271-0/+15
| |/
* / Add back --skip-turbolinks and remove --skip-gemsRafael Mendonça França2014-10-263-16/+12
|/ | | | | | | For the most part of cases --skip-gems option just remove one line in the Gemfile. This is not worth for the complexity it adds. Closes #17196
* :nail_care: it's -> its (see comments on 9a586ac)Godfrey Chan2014-10-181-1/+1
|
* [ci skip] A Rails engine is not a man :ok_woman:Zachary Scott2014-10-181-1/+1
|
* Merge pull request #17302 from ↵Rafael Mendonça França2014-10-182-4/+4
| | | | | | claudiob/replace-slower-block-call-with-faster-yield Replace (slower) block.call with (faster) yield
* Revert "Replace (slower) block.call with (faster) yield"Zachary Scott2014-10-182-4/+4
| | | | This reverts commit 0ab075e75f58bf403f7ebe20546c7005f35db1f6.
* Replace (slower) block.call with (faster) yieldclaudiob2014-10-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance optimization: `yield` with an implicit `block` is faster than `block.call`. See http://youtu.be/fGFM_UrSp70?t=10m35s and the following benchmark: ```ruby require 'benchmark/ips' def fast yield end def slow(&block) block.call end Benchmark.ips do |x| x.report('fast') { fast{} } x.report('slow') { slow{} } end # => fast 154095 i/100ms # => slow 71454 i/100ms # => # => fast 7511067.8 (±5.0%) i/s - 37445085 in 4.999660s # => slow 1227576.9 (±6.8%) i/s - 6145044 in 5.028356s ```
* Merge pull request #17292 from tricknotes/generator-test-docRafael Mendonça França2014-10-161-1/+1
|\ | | | | Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip]
| * Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip]Ryunosuke SATO2014-10-171-1/+1
| | | | | | | | | | `cleanup_destination_root` method is not found anywhere. Instead, `prepare_destination` clean up distination root on setup.
* | Use released rails-dom-testingRafael Mendonça França2014-10-161-2/+0
|/
* test, `Generators::GeneratedAttribute` with references, required, index.Yves Senn2014-10-161-0/+8
| | | | | | | | | | | | | Closes #17197. Closes #17207. `{required}` is a type modifier so it should be: user:references{required}:index and not: user:references:index{required}
* Merge pull request #17278 from velobuff/clarify-debugger-invocationYves Senn2014-10-161-1/+2
|\ | | | | clarify debugger platform invocation
| * clarify debugger platform invocationRaman Sinha2014-10-151-1/+2
| |
* | some changelog formatting. [ci skip]Yves Senn2014-10-161-1/+1
| |
* | Merge pull request #17280 from aditya-kapoor/remove-unneeded-fileYves Senn2014-10-161-9/+0
|\ \ | | | | | | remove unneeded file from Railties.
| * | remove unneeded fileAditya Kapoor2014-10-161-9/+0
| |/
* / use require_command! instead of calling its definitionAditya Kapoor2014-10-161-1/+1
|/
* Don't need to account turbolinks cookies in get request.Rafael Mendonça França2014-10-131-6/+6
| | | | | | | It was changed to not set the cookie in get requests at https://github.com/rails/turbolinks/commit/62cc3db457ad9745ccda047dd43ab84fb3d89707. Related with dcb05f26.
* Merge pull request #17240 from masarakki/fix-test_helper-of-mountable-pluginRafael Mendonça França2014-10-132-0/+7
|\ | | | | fix test_helper for mountable plugin
| * fix test_helper for mountable pluginmasarakki2014-10-132-0/+7
| |
* | Replace Enumerable#reverse.each with Enumerable#reverse_eachErik Michaels-Ober2014-10-131-1/+1
| |
* | Default generated Gemfile to coffee-rails ~> 4.1.0Joshua Peek2014-10-121-2/+2
|/
* Merge pull request #17088 from robin850/jruby-devRafael Mendonça França2014-10-011-0/+1
|\ | | | | Follow up to #16613
| * Follow up to #16613Robin Dupret2014-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since we want this flag to be enabled anytime we are running the tests under JRuby, let's enable this at the Rakefile level so people get the performance boost on their local checkout. Moreover, we avoid having to update this particular line anytime the option changes on the JRuby side. The only drawback is that we have to define it in every Rakefile but there's no big deal, this is already the case for other options.