aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* NPM -> npm [ci skip]Xavier Noria2019-05-123-4/+4
* Merge pull request #36073 from itsWill/document_update_counters_on_relationRyuta Kamizono2019-05-121-1/+13
|\
| * document update_counters on relation [ci skip]Guilherme Mansur2019-05-111-1/+13
* | Merge pull request #36257 from vipulnsward/sqlite-version-ymlRyuta Kamizono2019-05-122-2/+2
|\ \
| * | Update the sqlite db yaml template to match others and mention proper support...Vipul A M2019-05-122-2/+2
* | | Update the 6.0 load_defaults list [ci skip] (#36258)Vipul A M2019-05-111-0/+2
|/ /
* | Update Webpacker in Action Text's test dummy appGeorge Claghorn2019-05-1113-564/+443
* | Merge pull request #36160 from sharang-d/update-getting-startedVipul A M2019-05-111-1/+1
|\ \
| * | compilation -> compression [ci skip]Sharang Dashputre2019-05-021-1/+1
* | | Merge pull request #36251 from vishaltelangre/patch-10Xavier Noria2019-05-111-1/+1
|\ \ \
| * | | [ci skip] Clarify that the minimum version of a "gem" is bumpedVishal Telangre2019-05-121-1/+1
* | | | Merge pull request #36243 from vishaltelangre/patch-1Xavier Noria2019-05-111-1/+1
|\ \ \ \
| * | | | [ci skip] Typo: Javascript -> JavaScriptVishal Telangre2019-05-111-1/+1
| |/ / /
* | | | Merge pull request #36246 from vishaltelangre/patch-5Xavier Noria2019-05-111-1/+1
|\ \ \ \
| * | | | [ci skip] Fix grammarVishal Telangre2019-05-111-1/+1
| |/ / /
* | | | Merge pull request #36252 from vishaltelangre/patch-11Xavier Noria2019-05-111-1/+1
|\ \ \ \
| * | | | [ci skip] mysql -> MySQLVishal Telangre2019-05-111-1/+1
* | | | | 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