aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Fix rubocop offense introduced in 161ed37bogdanvlviv2018-07-081-1/+1
* | | | | | | | Raise an ArgumentError instead of a RuntimeErrorGeorge Claghorn2018-07-083-3/+3
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #33318 from lxxxvi/multiple_expressions_in_assert_no_diffe...Kasper Timm Hansen2018-07-082-0/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | added tests for assert_no_difference with multiple expressionslxxxvi2018-07-082-0/+28
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #33317 from bogdanvlviv/has_secure_password-use-recovery_p...Kasper Timm Hansen2018-07-085-23/+23
|\ \ \ \ \ \
| * | | | | | has_secure_password: use `recovery_password` instead of `activation_token`bogdanvlviv2018-07-085-23/+23
|/ / / / / /
* | | | | | Store newly-uploaded files on save rather than assignmentGeorge Claghorn2018-07-0722-679/+1049
* | | | | | Merge pull request #33307 from bogdanvlviv/improve-docs-test-of-has_secure_pa...Ryuta Kamizono2018-07-082-9/+28
|\ \ \ \ \ \
| * | | | | | Improve `SecurePasswordTest#test_authenticate`bogdanvlviv2018-07-061-4/+7
| * | | | | | Update `has_secure_password` info in the guidebogdanvlviv2018-07-061-5/+21
| | |_|/ / / | |/| | | |
* | | | | | Fix that models can clobber each others' attachment reflectionsGeorge Claghorn2018-07-073-16/+25
* | | | | | Merge pull request #32986 from kevgathuku/patch-1Ryuta Kamizono2018-07-081-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Specify location for engine-specific commandsKevin Ndung'u Gathuku2018-07-041-0/+3
| | |/ / / | |/| | |
* | | | | Don't balloon @original_options with --restart on restart.Kasper Timm Hansen2018-07-071-1/+1
* | | | | Don't show unneeded deprecation warning on server restart.Kasper Timm Hansen2018-07-072-11/+16
* | | | | Remove restart_command leftover from switching to Thor options.Kasper Timm Hansen2018-07-071-4/+0
* | | | | Use only snake cased symbols in commands.Kasper Timm Hansen2018-07-071-5/+5
| |/ / / |/| | |
* | | | Pass along arguments to underlying `get` method in `follow_redirect!` (#33299)Remo Fritzsche2018-07-053-3/+24
* | | | Merge pull request #32776 from Edouard-chin/ec-as-hooksKasper Timm Hansen2018-07-051-10/+11
|\ \ \ \
| * | | | Use testing lazy-load hooks:Edouard CHIN2018-07-041-10/+11
* | | | | Merge pull request #33298 from anniecodes/notes-command-testKasper Timm Hansen2018-07-051-12/+12
|\ \ \ \ \
| * | | | | Make NotesCommand tests more performant by getting rid of unecessary mapAnnie-Claude Côté2018-07-051-12/+12
* | | | | | Merge pull request #33297 from claudiob/shorter-attribute_previous_changeKasper Timm Hansen2018-07-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Shorter code: remove unnecessary conditionclaudiob2018-07-051-1/+1
|/ / / / /
* | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |