aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* remove unnecessary gsub for `action_cable_meta_tag`yuuji.yaginuma2016-01-301-1/+0
| | | | | | | If the specified `skip_action_cable` option, so as not to output the `action_cable_meta_tag` in template, gsub is unnecessary. ref: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt#L6..L8
* Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-templateRafael França2016-01-294-2/+42
|\ | | | | Add an after_bundle callback in Rails plugin templates
| * Implemented pull request changes.Ryan Manuel2016-01-291-7/+5
| |
| * Update doc with appropriate issue and pull request versionsRyan Manuel2016-01-281-1/+1
| |
| * Add an after_bundle callback in Rails plugin templatesRyan Manuel2016-01-284-2/+44
| |
* | Revert "Revert "Eliminate the EventMachine dependency""Matthew Draper2016-01-301-2/+1
| |
* | Merge pull request #23220 from maclover7/fix-23215Richard Schneeman2016-01-281-6/+0
|\ \ | |/ |/| Remove empty lines in Rails development logger
| * Remove empty lines in Rails development loggerJon Moss2016-01-241-6/+0
| | | | | | | | | | | | This is causing bugs like #23215 to occur, due to the extra spaces being inserted. Also, this is fixed upstream in the upcoming release of Sprockets 4.
* | Merge pull request #23237 from gsamokovarov/new-welcome-pageDavid Heinemeier Hansson2016-01-283-268/+65
|\ \ | | | | | | Introduce new welcome page for new projects
| * | Introduce new welcome page for new projectsGenadi Samokovarov2016-01-263-268/+65
| | | | | | | | | | | | As requested by David in 23233.
* | | Revert "Eliminate the EventMachine dependency"David Heinemeier Hansson2016-01-271-1/+2
| | |
* | | [ci skip] Don’t explicitly mention EventMachineclaudiob2016-01-252-2/+2
|/ / | | | | | | | | | | | | | | | | | | Since #23152 eliminated the EventMachine dependency, we don’t need to explicitly mention EventMachine. Nevertheless, I'm not 100% sure about saying "the websocket-driver loop" driver… any suggestions, @matthewd or @pixeltrix ? :sweat_smile: [ci skip]
* | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 5-0-beta-sec: bumping version fix version update task to deal with .beta1.1 Eliminate instance level writers for class accessors allow :file to be outside rails root, but anything else must be inside the rails view directory Don't short-circuit reject_if proc stop caching mime types globally use secure string comparisons for basic auth username / password
| * | bumping versionAaron Patterson2016-01-251-1/+1
| | |
* | | Merge pull request #23212 from vipulnsward/bin-railsKasper Timm Hansen2016-01-249-95/+96
|\ \ \ | | | | | | | | Be consistent in testing outputs from railties test and use /bin/rails
| * | | Be consistent in testing outputs from railties test and use /bin/rails ↵Vipul A M2016-01-249-95/+96
| | |/ | |/| | | | | | | | | | | | | everywhere(the default behaviour now) instead of mix of /bin/rake /bin/rails everywhere [Ryo Hashimoto & Vipul A M]
* | | Merge pull request #23152 from matthewd/actioncable-concurrentDavid Heinemeier Hansson2016-01-241-2/+1
|\ \ \ | | | | | | | | Eliminate the EventMachine dependency
| * | | Ditch the EM error logging helperMatthew Draper2016-01-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | We're no longer doing our work in the EM event loop, so errors are quite unlikely, and if they do occur, they're not really our responsibility to handle.
* | | | Pare back default `index` option for the migration generatorPrathamesh Sonpatki2016-01-244-32/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | - Using `references` or `belongs_to` in migrations will always add index for the referenced column by default, without adding `index:true` option to generated migration file. - Users can opt out of this by passing `index: false`. - Legacy migrations won't be affected by this change. They will continue to run as they were before. - Fixes #18146
* / / Rails::Generators::Actions#gem should work even if frozen string is passed ↵Prathamesh Sonpatki2016-01-242-1/+9
|/ / | | | | | | | | | | as argument - Fixes #23137.
* | prevent --skip-action-cable from erroring when --api option is usedDave Riddle2016-01-222-1/+13
| |
* | remove `per_form_csrf_tokens` initializer from Rails APIyuuji.yaginuma2016-01-222-0/+2
| | | | | | | | | | Because the form is not in the Rails API, `per_form_csrf_tokens` initializer I think unnecessary.
* | Merge pull request #23174 from JuanitoFatas/followup-skip-action-cableKasper Timm Hansen2016-01-222-0/+4
|\ \ | | | | | | Remove action_cable_meta_tag when skip Action Cable
| * | Remove action_cable_meta_tag when skip action_cableJuanitoFatas2016-01-222-0/+4
| | |
* | | Add `config/cable.yml` to list of default files in Rails generatorJon Moss2016-01-211-0/+1
|/ /
* | Merge pull request #23078 from ↵Rafael França2016-01-214-1/+12
|\ \ | | | | | | | | | | | | y-yagi/add_application_mailer_rb_to_mountable_engine add application_mailer.rb to template of mountable engine
| * | allow symbol to end of string in `wrap_in_modules`yuuji.yaginuma2016-01-162-5/+5
| | |
| * | add application_mailer.rb to template of mountable engineyuuji.yaginuma2016-01-153-0/+11
| | | | | | | | | | | | | | | since 9446e38ba47c9ca3be2ad668d8a8bea0141be6fc, generated mailer inherents from ApplicationMailer, ApplicationMailer is required in the mountable engine.
* | | updating secrets.yml template to use rails command instead of rakeDiego Plentz2016-01-211-1/+1
| | |
* | | Merge pull request #22950 from maclover7/adapterize-storage-actioncableMatthew Draper2016-01-205-12/+35
|\ \ \ | | | | | | | | | | | | Adapterize storage for ActionCable
| * | | Add em-hiredis and redis as default Gems for new applicationsJon Moss2016-01-182-0/+20
| | | |
| * | | Adapterize ActionCable storage and extract behaviorJon Moss2016-01-184-12/+15
| | | |
* | | | Remove incomplete filter runs all tests in plugins.Kasper Timm Hansen2016-01-181-8/+0
| | | | | | | | | | | | | | | | Forgot to remove it, when I changed the expectations in 88881d2.
* | | | Don't run all tests when files end in a colon.Kasper Timm Hansen2016-01-182-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If running `bin/rails t test/models/bunny_test.rb:` we'd implicitly run all the tests in the bunny test. I now highly doubt that people would ever put in a line filter without a line *and* want that to mean run all tests in that file. Instead, change regex to require a line digit after the colon, so runs without a line at the end would fail to require the test file. This also has the side benefit of breaking requiring a file with many colons: `bin/rails t test/models/bunny_test.rb:::::::::::::4` Think this means I've had enough colonoscopy to last me through the year :)
* | | | Merge pull request #23006 from Edouard-chin/code_statistic_ignore_hidde_filesKasper Timm Hansen2016-01-182-2/+15
|\ \ \ \ | |/ / / |/| | | CodeStatistic will now ignore hidden files:
| * | | CodeStatistic will now ignore hidden files:Edouard CHIN2016-01-182-2/+15
| | | | | | | | | | | | | | | | - Modify the default regex to not match hidden files
* | | | Avoid multiple default paths to server.pid fileTawan Sierek2016-01-162-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug (#22811) that occurs when rails server is started in daemon mode and optional path to the `server.pid` file is omitted. Store default path in a constant instead of evaluating it multiple time using `File.expand_path`. The bug in detail: The server startup procedure crashes, since it tries to open a file at `/tmp/pids/server.pid` instead of `<path to project>/tmp/pids/server.pid`. This bug was introduced in 51211a94bd when Rack was upgraded from version 1.x to 2.x. Since version 2.x, Rack does not memoize the options hash [1], and as a consequence `Rails::Server#default_options` will be evaluated multiple times. The hash returned by `Rails::Server#default_options` holds the default path to the `server.pid` file. The path is generated with the method `File.expand_path`. However, the return value of this method depends on the current working directory [2], which changes once `Process.daemon` is invoked by `Rack::Server#daemonize_app` and the process is detached from the current shell. Close #22811 [1]https://git.io/vzen2 [2]http://ruby-doc.org/core-2.1.5/File.html#method-c-expand_path
* | | | remove unnecessary `ENV[]` from `log:clear` example [ci skip]yuuji.yaginuma2016-01-161-1/+1
| |/ / |/| |
* | | Merge pull request #23014 from jonatack/improve-generated-config-filesRafael França2016-01-152-4/+6
|\ \ \ | | | | | | | | Improve generated config initializer files
| * | | Improve generated config initializer filesJon Atack2016-01-132-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix grammar. - Improve readability/understanding. - Wrap lines at 80 characters. [skip ci]
* | | | bring back `TEST` env for `rake test`.Yves Senn2016-01-123-1/+21
|/ / / | | | | | | | | | | | | | | | | | | Closes #23027. This does not restore complete backwards compatibility. It simply passes the contets of the `TEST` env to the new runner.
* | | Merge pull request #23003 from y-yagi/remove_warningsKasper Timm Hansen2016-01-111-2/+2
|\ \ \ | | | | | | | | remove warnings from rake test
| * | | remove warnings from rake testyuuji.yaginuma2016-01-111-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warnings. ``` test/application/rake_test.rb:33: warning: ambiguous first argument; put parentheses or a space even after `/' operator test/application/rake_test.rb:43: warning: ambiguous first argument; put parentheses or a space even after `/' operator ```
* | | Merge pull request #22808 from y-yagi/do_not_clear_all_reportersKasper Timm Hansen2016-01-111-1/+2
|\ \ \ | |/ / |/| | delete only unnecessary reporter
| * | delete only unnecessary reporteryuuji.yaginuma2016-01-111-1/+2
| | | | | | | | | | | | | | | Reporter that defines its own users at the time of this process are also loaded, to avoid them from being deleted, to delete only the specified to unnecessary reporter.
* | | Added multiple line filters support for test runnerSiva Gollapalli2016-01-103-4/+87
| | |
* | | Merge pull request #22703 from joshsoftware/rake-log-clearKasper Timm Hansen2016-01-093-9/+32
|\ \ \ | | | | | | | | rake log:clear task updated
| * | | rake log:clear task updated refs[#22544]Pramod2016-01-093-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoided truncating all files if no ENV['LOGS'] specified - Updated task to accept LOGS=all for truncating all files from log/ i.e. log/*log - If no LOGS specified will truncates standard environment log files i.e. 'development,test,production' - CHANGELOG & guide update added - bin/setup test cases fixed
* | | | [ci skip] Clarify some Minitest origins.Kasper Timm Hansen2016-01-091-0/+2
| | | | | | | | | | | | | | | | | | | | It might be tough for readers to know why we implement `===`, and where the Regexp in `derive_regexp` came from.
* | | | Extract line filtering to Railties.Kasper Timm Hansen2016-01-092-0/+69
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line filter parsing added to ActiveSupport::TestCase is only half the story to enable line filtering. The other half, of adding the patterns to the options, is done in the Minitest plugin that Railties has. Thus it makes more sense to have the filter in Railties with the other half and all the line filtering tests. Move the filter and extend Active Support in an initializer, so that when users or `rails/all.rb` require `rails/test_unit/railtie` we can still filter by line.