aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #36247 from vishaltelangre/patch-6Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] ActionView -> Action ViewVishal Telangre2019-05-111-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #36248 from vishaltelangre/patch-7Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] Mime -> MIMEVishal Telangre2019-05-111-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #36249 from vishaltelangre/patch-8Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] Expand JS to JavaScript for clarityVishal Telangre2019-05-111-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #36250 from vishaltelangre/patch-9Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | [skip ci] arel -> ArelVishal Telangre2019-05-111-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #36244 from vishaltelangre/patch-3Ryuta Kamizono2019-05-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Typo: ActiveSuppport -> ActiveSupportVishal Telangre2019-05-111-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #36241 from vishaltelangre/fix-confusing-sentence-in-upgra...Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Fix confusing sentence in upgrade guideVishal Telangre2019-05-111-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #36242 from shekhar-patil/masterVipul A M2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Corrected the sentence in upgrade guideshekhar-patil2019-05-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'migration-timestamp-fix'Gannon McGibbon2019-05-104-0/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add class option timestamps to migration generatorMichael Duchemin2019-02-094-0/+22
* | | | | | | | | | Merge pull request #36184 from vishaltelangre/as-monotonic-timed-subscriberEileen M. Uchitelle2019-05-104-9/+131
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Introduce 'ActiveSupport::Notifications::Fanout::Subscribers::MonotonicTimed'...Vishal Telangre2019-05-104-9/+131
* | | | | | | | | | | Merge pull request #36181 from jamesdabbs/jcd/action-mailbox-forGeorge Claghorn2019-05-095-5/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add CHANGELOG entryJames Dabbs2019-05-091-0/+2
| * | | | | | | | | | | Delegate to the correct method in `ActionMailbox.mailbox_for`James Dabbs2019-05-051-1/+1
| * | | | | | | | | | | Rename variable to represent typeJames Dabbs2019-05-051-2/+2
| * | | | | | | | | | | Expose `mailbox_for` methodJames Dabbs2019-05-044-5/+28
* | | | | | | | | | | | fixes configuration examples [ci skip]Xavier Noria2019-05-091-3/+3
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #36225 from deivid-rodriguez/workaround_sass_rails_require...Yuji Yaginuma2019-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use a better requirement for sass-rails 6 prereleasesDavid Rodríguez2019-05-091-1/+1
* | | | | | | | | | | | Merge pull request #36223 from sharang-d/revert-36214Ryuta Kamizono2019-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix indentation of the config.eager_load nil warningSharang Dashputre2019-05-091-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #36216 from utilum/update_resque_schedulerRyuta Kamizono2019-05-091-16/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bundle update resque-scheduler to latest versionutilum2019-05-081-16/+16
* | | | | | | | | | | | Merge pull request #36221 from jhawthorn/middleware_instrumentationRafael França2019-05-083-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Only build middleware proxy when instrumentatingJohn Hawthorn2019-05-083-6/+17
|/ / / / / / / / / / /
* | | | | | | | | | | documents restriction for explicit namespaces [ci skip]Xavier Noria2019-05-081-0/+34
* | | | | | | | | | | documents how to use the classic autoloader in Rails 6 [ci skip]Xavier Noria2019-05-081-0/+11
* | | | | | | | | | | Merge pull request #36214 from abhaynikam/36211-fix-indentationRafael França2019-05-081-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix indentation for config.eager_load nil warning messageAbhay Nikam2019-05-081-5/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #36215 from rmacklin/update-testing-guideVipul A M2019-05-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update testing guide to reflect changes from #36047Richard Macklin2019-05-081-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Auto-correct `Style/RedundantBegin` offenceRyuta Kamizono2019-05-081-5/+3
* | | | | | | | | | Fix broken markup in CHANGELOG [ci skip]Ryuta Kamizono2019-05-081-8/+9
* | | | | | | | | | Remove forward ported CHANGELOG [ci skip]Ryuta Kamizono2019-05-081-4/+0
* | | | | | | | | | documents autoloading in the upgrading guide [ci skip]Xavier Noria2019-05-081-0/+172
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #36196 from st0012/fix-29947Eileen M. Uchitelle2019-05-078-4/+53
* | | | | | | | | Merge pull request #36203 from st0012/fix-command-in-contributing-guideRyuta Kamizono2019-05-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update directory name in sample commandsst00122019-05-081-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Typo in the release noteAkira Matsuda2019-05-081-1/+1
* | | | | | | | | Merge pull request #36202 from yahonda/log_transactionRyuta Kamizono2019-05-086-23/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove ignored_sql from SQLCounter by adding "TRANSACTION" to log nameYasuo Honda2019-05-086-23/+15
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #36201 from soartec-lab/fix_typo_dot_positionVipul A M2019-05-071-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed typo of dot position [skip ci]soartec-lab2019-05-071-1/+1
|/ / / / / / /