aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23169 from y-yagi/rake_proxy_in_engineKasper Timm Hansen2016-01-315-39/+126
|\
| * make rake proxy work in rails enginesyuuji.yaginuma2016-01-315-39/+126
* | Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-011-0/+3
|/
* remove unnecessary gsub for `action_cable_meta_tag`yuuji.yaginuma2016-01-301-1/+0
* Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-templateRafael França2016-01-294-2/+42
|\
| * 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 loggerJon Moss2016-01-241-6/+0
* | Merge pull request #23237 from gsamokovarov/new-welcome-pageDavid Heinemeier Hansson2016-01-283-268/+65
|\ \
| * | Introduce new welcome page for new projectsGenadi Samokovarov2016-01-263-268/+65
* | | Revert "Eliminate the EventMachine dependency"David Heinemeier Hansson2016-01-271-1/+2
* | | [ci skip] Don’t explicitly mention EventMachineclaudiob2016-01-252-2/+2
|/ /
* | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-251-1/+1
|\ \
| * | 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 everyw...Vipul A M2016-01-249-95/+96
| | |/ | |/|
* | | Merge pull request #23152 from matthewd/actioncable-concurrentDavid Heinemeier Hansson2016-01-241-2/+1
|\ \ \
| * | | Ditch the EM error logging helperMatthew Draper2016-01-241-2/+1
* | | | Pare back default `index` option for the migration generatorPrathamesh Sonpatki2016-01-244-32/+13
|/ / /
* / / Rails::Generators::Actions#gem should work even if frozen string is passed as...Prathamesh Sonpatki2016-01-242-1/+9
|/ /
* | 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
* | Merge pull request #23174 from JuanitoFatas/followup-skip-action-cableKasper Timm Hansen2016-01-222-0/+4
|\ \
| * | 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 y-yagi/add_application_mailer_rb_to_mountable_...Rafael França2016-01-214-1/+12
|\ \
| * | 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
* | | 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
|\ \ \
| * | | 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
* | | | Don't run all tests when files end in a colon.Kasper Timm Hansen2016-01-182-9/+1
* | | | Merge pull request #23006 from Edouard-chin/code_statistic_ignore_hidde_filesKasper Timm Hansen2016-01-182-2/+15
|\ \ \ \ | |/ / / |/| | |
| * | | CodeStatistic will now ignore hidden files:Edouard CHIN2016-01-182-2/+15
* | | | Avoid multiple default paths to server.pid fileTawan Sierek2016-01-162-1/+12
* | | | 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 filesJon Atack2016-01-132-4/+6
* | | | bring back `TEST` env for `rake test`.Yves Senn2016-01-123-1/+21
|/ / /
* | | Merge pull request #23003 from y-yagi/remove_warningsKasper Timm Hansen2016-01-111-2/+2
|\ \ \
| * | | remove warnings from rake testyuuji.yaginuma2016-01-111-2/+2
| |/ /
* | | Merge pull request #22808 from y-yagi/do_not_clear_all_reportersKasper Timm Hansen2016-01-111-1/+2
|\ \ \ | |/ / |/| |
| * | delete only unnecessary reporteryuuji.yaginuma2016-01-111-1/+2
* | | 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
|\ \ \