aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Only have Yarn bundling commented out as we cant be sure Yarn is installedDavid Heinemeier Hansson2016-12-082-5/+2
| | | | |
| | * | | Fix ability to run railties test suiteDavid Heinemeier Hansson2016-12-081-0/+1
| | | | |
| | * | | fix broken tests (#27308)Yuji Yaginuma2016-12-081-3/+2
| | | | | | | | | | | | | | | Follow up to 0d20530e5edfd7d00fbc2a38ef5f87eca6ccc924
| | * | | specify `skip_yarn` option in API-only Application (#27309)Yuji Yaginuma2016-12-082-3/+12
| | | | |
| | * | | Merge pull request #25051 from bf4/extract_notes_as_binarySean Griffin2016-12-081-1/+1
| | |\ \ \ | | | | | | | | | | | | Extract notes as binary
| | | * | | Extract notes from files in binaryBenjamin Fleischer2016-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents: ArgumentError: invalid byte sequence in UTF-8 railties/lib/rails/source_annotation_extractor.rb:115:in `=~' railties/lib/rails/source_annotation_extractor.rb:115:in `block in extract_annotations_from' And there's no reason we need to interpret the files as UTF-8 when scanning for annotations. Applies to Rails 4.2 as well.
| | * | | | Make Yarn the default, drop default vendor/asset directories (#27300)David Heinemeier Hansson2016-12-0811-111/+34
| | | | | |
| | * | | | Update puma.rbbrchristian2016-12-051-6/+6
| | | | | | | | | | | | | | | | | | Clarifying some of the language/punctuation and removing a couple comma splices.
| | * | | | Add fullstop following the pattern used in rest of the filePrathamesh Sonpatki2016-12-051-1/+1
| | | | | |
| | * | | | Fix binstop -> binstub typo in railties changelog.Josef Šimánek2016-12-051-1/+1
| | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | Use JavaScripts instead of Javascripts in `rake stats`Koichi ITO2016-12-031-1/+1
| | | | | |
| | * | | | use yarn binstub in `bin/update`yuuji.yaginuma2016-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Follow up to 3dac36bd8e26363bb10f4d2a7b21efa75d200e26
| * | | | | clear all environments log files by defaultyuuji.yaginuma2016-10-143-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #22703, `log:clear` task has been changed to clear only standard environment log files. However, it is often to add a non-standard environment(e.g. "staging"). Therefore, I think than it is better to clear all environments log files by default.
* | | | | | use Thor option parser in server commands parseyuuji.yaginuma2016-12-242-90/+110
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ServerCommand` inherits Thor, but currently does not use Thor option parser. Therefore, if leave the argument of Thor as it is, it becomes an error by the argument checking of Thor. To avoid it, to use the Thor option parser instead of reimplementing it. Fixes #26964
* | | | | Yarn: Move node_modules, package.json, and yarn.lock file to vendor (#27245)David Heinemeier Hansson2016-12-018-12/+16
| | | | | | | | | | | | | | | Move node_modules, package.json, and yarn.lock file to vendor
* | | | | use `Gem.win_platform?` to check windows Ruby platformsyuuji.yaginuma2016-11-304-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | `Gem.win_platform?` check if it is Windows more accurately. Ref: https://github.com/ruby/ruby/blob/ruby_2_2/lib/rubygems.rb#L945..L952
* | | | | Merge pull request #27221 from phoet/current_is_not_usedMatthew Draper2016-11-301-1/+0
|\ \ \ \ \ | | | | | | | | | | | | removed `@current` as it is not used
| * | | | | removed `@current` as it is not usedphoet2016-11-301-1/+0
| | | | | |
* | | | | | fix typo in changelogRobert Glaser2016-11-301-1/+1
|/ / / / /
* | | | | Let's use only vendored rails-ujs while we start to publish it to npm registryGuillermo Iguaran2016-11-291-3/+1
| | | | |
* | | | | Add CHANGELOG entry for --yarn optionLiceth Ovalles2016-11-291-0/+5
| | | | |
* | | | | Merge pull request #26836 from Liceth/npmGuillermo Iguaran2016-11-298-3/+106
|\ \ \ \ \ | | | | | | | | | | | | Add Yarn support in new apps using --yarn option
| * | | | | Run yarn on setup and update scripts.Liceth Ovalles2016-11-282-2/+8
| | | | | |
| * | | | | Add node_modules to default gitignoreLiceth Ovalles2016-11-281-0/+5
| | | | | |
| * | | | | Add node_modules path to assets load paths when --yarn option is usedLiceth Ovalles2016-11-282-0/+5
| | | | | |
| * | | | | Add package.json for Yarn if --yarn option is addedLiceth Ovalles2016-11-284-1/+88
| | | | | |
* | | | | | rails-ujs is now shipped with Action ViewGuillermo Iguaran2016-11-294-8/+2
| | | | | |
* | | | | | use correct variable in BacktraceCleaner testyuuji.yaginuma2016-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `@target_dir` variable was changed to local variable in 8e1714b.
* | | | | | Merge pull request #27140 from ↵Rafael França2016-11-252-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | supercaracal/fix-force-ssl-if-session-store-disabled Fix a force ssl redirection bug that occur when session store disabled.
| * | | | | | Remove aggressive unit test with mock. And add integration level test.Taishi Kasuga2016-11-242-1/+19
| | | | | | |
* | | | | | | [ci skip] `MiniTest` -> `Minitest`Fumiaki MATSUSHIMA2016-11-241-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | MiniTest was renamed to Minitest. Already renamed on https://github.com/rails/rails/pull/13366 But slipped into on https://github.com/rails/rails/pull/18413/files#diff-6bb90a693835b0e92910b796c8b0ef59R27
* | | | | | Add CHANGELOG entryGuillermo Iguaran2016-11-211-0/+5
| | | | | |
* | | | | | Don't add jQuery by default in new apps and use rails-ujs as UJS adapter insteadGuillermo Iguaran2016-11-215-18/+20
|/ / / / /
* | | / / deep symbolize keys on secrets.ymlIsaac Sloan2016-11-213-2/+22
| |_|/ / |/| | |
* | | | Pass `rails runner` args onto file again.Kasper Timm Hansen2016-11-202-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making the new command insfrastructure I had missed that `bin/rails runner some_file.rb some args` would pass the extra args onto the file in `ARGV`. Now fixed by allowing the command to take extra args again, and make sure to remove the file name from `ARGV`.
* | | | Use existing --skip-turbolinks option for conditionals instead of checking ↵Guillermo Iguaran2016-11-192-2/+2
| | | | | | | | | | | | | | | | if turbolinks is present in gemfile list
* | | | Merge pull request #27106 from prathamesh-sonpatki/add-missing-testEileen M. Uchitelle2016-11-191-0/+20
|\ \ \ \ | | | | | | | | | | Add missing test for singular resource output in rake routes
| * | | | Add missing test for singular resource output in rake routesPrathamesh Sonpatki2016-11-191-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This test was present in https://github.com/rails/rails/pull/27089 but not present on master, may be removed in merge commit? - There was discussion about moving this to `application/rake_test` so may be this happened in merge commit. - https://github.com/rails/rails/pull/27089#discussion_r88731157
* | | | | move CHANGELOG entry to the appropriate file [ci skip]yuuji.yaginuma2016-11-191-6/+0
|/ / / / | | | | | | | | | | | | Follow up to #27098
* | | | Merge pull request #27089 from erickueen/erickueen_fix_26606Rafael Mendonça França2016-11-181-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | Fix incorrect output from rails routes when using singular resources …
| * | | | Fix incorrect output from rails routes when using singular resources issue ↵Erick Reyna2016-11-182-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #26606 Rails routes (even rake routes in previous versions) output showed incorrect routes when an application use resource :controller, implying that edit_controller_path match with controller#show. The order of the output has changed to correct this. View #26606 for more information. Added a test case, change unit test in rake to expect the new output. Since the output of resource :controller is changing, the string spected of the railties/test/application/rake_test.rb test_rails_routes_with_controller_environment had to be modified.
* | | | | Merge pull request #27092 from prathamesh-sonpatki/https-source-bundlerRafael França2016-11-181-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Use secure source for gems referencing "github" in the generated apps
| * | | | | Use secure source for gems referencing "github" in the generated appsPrathamesh Sonpatki2016-11-181-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New apps generated on master and latest bundler give warning about "github" source being insecure. - Use the same solution used for Rails master in the generated app's Gemfile to fix this issue.
* / / / / Fix `ActionDispatch::IntegrationTest#open_session`Tawan Sierek2016-11-181-0/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset a new session directly after its creation in `ActionDispatch::IntegrationTest#open_session`. Reset the session to a clean state before making it available to the client's test code. Issue #22742 reports unexpected behavior of integration tests that run multiple sessions. For example an `ActionDispatch::Flash` instance is shared across multiple sessions, though a client code will rightfully assume that each new session has its own flash hash. The following test failed due to this behavior: class Issue22742Test < ActionDispatch::IntegrationTest test 'issue #22742' do integration_session # initialize first session a = open_session b = open_session refute_same(a.integration_session, b.integration_session) end end Instead of creating a new `ActionDispatch::Integration::Session` instance, the same instance is shared across all newly opened test sessions. This is due to the way how new test sessions are created in `ActionDispatch::IntegrationTest#open_session`. The already existing `ActionDispatch::IntegrationTest` instance is duplicated with `Object#dup`, This approach was introduced in commit 15c31c7639b. `Object#dup` copies the instance variables, but not the objects they reference. Therefore this issue only occurred when the current test instance had been tapped in such a way that the instance variable `@integration_session` was initialized before creating the new test session. Close #22742 [Tawan Sierek + Sina Sadeghian]
* | | | Add `:skip_sprockets` to `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`Tsukuru Tanimichi2016-11-143-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `rails plugin new` with `--full` and `--skip-sprockets` options generates a dummy application that throws `NoMethodError`. ``` % rails plugin new my_engine -S --full --skip-gemspec % cd my_engine % bin/rails test rails aborted! NoMethodError: undefined method `assets' for #<Rails::Application::Configuration:0x007f83aa1e6100> ```
* | | | Merge pull request #26905 from bogdanvlviv/docsAndrew White2016-11-131-2/+2
|\ \ \ \ | | | | | | | | | | Add missing `+` around a some literals.
| * | | | Add missing `+` around a some literals.bogdanvlviv2016-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly around `nil` [ci skip]
* | | | | Add test for #25248Sean Griffin2016-11-121-0/+10
| | | | |
* | | | | Merge pull request #25248 from bluesh55:features/skip-coffeeSean Griffin2016-11-121-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add --skip-coffee generating option
| * | | | | Add --skip-coffee generating optionseunghwan oh2016-06-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage `rails new awesome-project --skip-coffee`