aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #33220 from anniecodes/notes-commandKasper Timm Hansen2018-07-055-46/+237
|\
| * Port Annotations rake task to use Rails::NotesCommandAnnie-Claude Côté2018-07-042-7/+14
| * Adds support to register directories and extensions to NotesCommandAnnie-Claude Côté2018-07-042-0/+46
| * Adds a Rails::Command for NotesAnnie-Claude Côté2018-07-042-0/+121
| * [ci skip] Update documentation related to `rails notes`Annie-Claude Côté2018-07-032-39/+56
* | Merge pull request #33294 from bibstha/remove_unnecessary_require_on_gcs_serviceGeorge Claghorn2018-07-041-1/+0
|\ \
| * | Remove vestigial require on ActiveStorage GCSServiceBibek Shrestha2018-07-041-1/+0
|/ /
* | Merge pull request #33288 from ioquatix/patch-2Rafael França2018-07-041-2/+4
|\ \
| * | Better compatibility with SPEC.Samuel Williams2018-07-041-2/+4
* | | A Class is a Module so we remove one conditionalRafael Mendonça França2018-07-041-1/+1
* | | Merge pull request #33289 from Edouard-chin/ec-lazy-load-hooksRafael França2018-07-042-1/+54
|\ \ \ | |/ / |/| |
| * | Use class_eval or instance_eval when triggering lazy load hooks:Edouard CHIN2018-07-032-1/+54
* | | Merge pull request #33286 from ph3t/add-changelog-entry-for-42c3537Ryuta Kamizono2018-07-041-1/+13
|\ \ \
| * | | Add changelog entry for 42c3537 [ci skip]Juan Broullon2018-07-031-1/+11
* | | | Merge pull request #33287 from albertoalmagro/remove-old-todo-generatorRyuta Kamizono2018-07-041-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove old TODO commentAlberto Almagro2018-07-041-1/+0
|/ / /
* | | Merge pull request #33054 from jboler/masterRafael França2018-07-033-20/+5
|\ \ \
| * | | Only execute route updater once on app bootJonathan Boler2018-06-192-6/+2
| * | | Merge branch 'master' of github.com:rails/railsJonathan Boler2018-06-0425-68/+231
| |\ \ \
| * | | | Eager load routes on rebuildJonathan Boler2018-06-041-14/+2
| * | | | Only build routes simulator when there is an ASTJonathan Boler2018-06-041-0/+1
* | | | | Merge pull request #33282 from alpaca-tc/remove_unnecessary_dependentsRafael França2018-07-032-2/+0
|\ \ \ \ \
| * | | | | ActiveJob::Base no longer dependents on Serializersalpaca-tc2018-07-032-2/+0
* | | | | | Merge pull request #32361 from ph3t/safe-html-translation-arraysKasper Timm Hansen2018-07-032-4/+10
|\ \ \ \ \ \
| * | | | | | Add safe html support to arrays of translationsJuan Broullon2018-07-032-4/+10
* | | | | | | Merge pull request #33208 from utilum/bump_sprocketsEileen M. Uchitelle2018-07-031-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Update sprockets to Security release for CVE-2018-3760utilum2018-06-271-1/+1
* | | | | | | Use `construct_join_dependency` in all placesRyuta Kamizono2018-07-033-13/+6
* | | | | | | Don't extract `readonly_value` each timeRyuta Kamizono2018-07-032-5/+7
* | | | | | | Don't share seen object cache between different join nodes in eager loadingRyuta Kamizono2018-07-032-2/+20
* | | | | | | Merge pull request #32987 from kevgathuku/patch-2Kasper Timm Hansen2018-07-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Change location for running copy migrations commandKevin Ndung'u Gathuku2018-05-251-1/+1
* | | | | | | | Merge pull request #33242 from brasic/sqlite-readonlyRyuta Kamizono2018-07-032-1/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Support readonly option in SQLite3AdapterCarl Brasic2018-07-022-1/+36
|/ / / / / / / /
* | | | | | | | Merge pull request #33273 from sohopro/patch-1Kasper Timm Hansen2018-07-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix error of a file namesohopro2018-07-021-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #32706 from yhirano55/fix-app-update-when-hyphenated-name-...Kasper Timm Hansen2018-07-012-5/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix app:update when hyphenated name is givenYoshiyuki Hirano2018-04-242-5/+33
* | | | | | | | | Revert "Merge pull request #33234 from alpaca-tc/autoload_activejob_arguments"Kasper Timm Hansen2018-07-013-1/+3
* | | | | | | | | Refactor #33254.Kasper Timm Hansen2018-07-013-29/+28
* | | | | | | | | Merge pull request #33267 from utilum/railties_testoptsKasper Timm Hansen2018-07-011-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix assignment of TESTOPTS in railties test taskutilum2018-07-011-1/+3
* | | | | | | | | | Merge pull request #33265 from bogdanvlviv/allow-queue-option-to-assert_no_en...Ryuta Kamizono2018-07-013-2/+96
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow `queue` option to `assert_no_enqueued_jobs`bogdanvlviv2018-06-303-2/+96
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33257 from utilum/ruby-warningsRyuta Kamizono2018-06-303-5/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Ruby warnings tickled by the test suiteutilum2018-06-303-5/+8
* | | | | | | | | | Merge pull request #33263 from bogdanvlviv/follow-up-33258Ryuta Kamizono2018-06-302-4/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clarify activejob/lib/active_job/test_helper.rbbogdanvlviv2018-06-292-4/+10
* | | | | | | | | | | Merge pull request #33262 from gsmnv/patch-1Ryuta Kamizono2018-06-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove erroneous remove_column option from exampleGeorge Semenov2018-06-291-1/+1
| |/ / / / / / / / /