aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #36252 from vishaltelangre/patch-11Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] mysql -> MySQL
| * | | | | | | | | | | [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 View
| * | | | | | | | | | | | [ci skip] ActionView -> Action ViewVishal Telangre2019-05-111-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the documentation guides, we use 'Action View' instead of `ActionView` in the general language. Reference: https://github.com/rails/rails/commit/27138386ad8dbda2eb44e622515626f352fd3b22
* | | | | | | | | | | | Merge pull request #36248 from vishaltelangre/patch-7Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Mime -> MIME
| * | | | | | | | | | | | [ci skip] Mime -> MIMEVishal Telangre2019-05-111-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct word is `MIME` which is an acronym which stands for `Multipurpose Internet Mail Extensions`. Reference: https://en.wikipedia.org/wiki/MIME
* | | | | | | | | | | | Merge pull request #36249 from vishaltelangre/patch-8Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Expand JS to JavaScript for clarity
| * | | | | | | | | | | | [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 -> Arel
| * | | | | | | | | | | [skip ci] arel -> ArelVishal Telangre2019-05-111-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | As per the documentation guides, we write `Arel` instead of `arel`.
* | | | | | | | | | | Merge pull request #36244 from vishaltelangre/patch-3Ryuta Kamizono2019-05-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | [ci skip] Typo: ActiveSuppport -> ActiveSupport
| * | | | | | | | | | [ci skip] Typo: ActiveSuppport -> ActiveSupportVishal Telangre2019-05-111-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #36241 from ↵Xavier Noria2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vishaltelangre/fix-confusing-sentence-in-upgrade-guide [ci skip] Fix confusing sentence in upgrade guide
| * | | | | | | | | | [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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | [ci skip] Corrected the sentence in upgrade guide
| * | | | | | | | | Corrected the sentence in upgrade guideshekhar-patil2019-05-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'migration-timestamp-fix'Gannon McGibbon2019-05-104-0/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28707.
| * | | | | | | | | Add class option timestamps to migration generatorMichael Duchemin2019-02-094-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes GH#28706. Now rails g migration create_users and rails g model User have the same behavior for timestamps since they implement the same migration template. The expected behavior is that this create table migration will create the table with timestamps unless you pass --no-timestamps or --skip-timestamps to the generator. The expected migration should match what you get when you use the model generator. Using the migration generator, which doesn't have a class_option for timestamps would cause them to not be added to the migration file. Now the migration behavior of the migration generator, create_table only, is aligned with the migration behavior of the model generator. Also modified relevant example of ActiveRecord Migrations Guide.
* | | | | | | | | | Merge pull request #36184 from vishaltelangre/as-monotonic-timed-subscriberEileen M. Uchitelle2019-05-104-9/+131
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Introduce ActiveSupport::Notifications.monotonic_subscribe
| * | | | | | | | | | Introduce ↵Vishal Telangre2019-05-104-9/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ActiveSupport::Notifications::Fanout::Subscribers::MonotonicTimed' and 'ActiveSupport::Notifications::monotonic_subscribe' Also, change the signature of ‘ActiveSupport::Notifications::Fanout#subscribe’ to accept optional ‘monotonic’ boolean argument. Then initialize either a ‘Timed’ or ‘MonotonicTimed’ subscriber based on the value of ‘monotonic’ parameter. Introduce ‘ActiveSupport::Notifications::monotonic_subscribe’ method Also, provision ‘ActiveSupport::Notifications::subscribed’ to optionally accept ‘monotonic’ boolean argument. Update documentation for ActiveSupport::Notifications Add tests Update guides documentation under the 'Active Support Instrumentation' chapter Incorporate feedback: use optional keyword argument to specify optional 'monotonic' option to 'subscribed' method Fix a typo
* | | | | | | | | | | Merge pull request #36181 from jamesdabbs/jcd/action-mailbox-forGeorge Claghorn2019-05-095-5/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose `mailbox_for` method
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per comments from CR
| * | | | | | | | | | | Expose `mailbox_for` methodJames Dabbs2019-05-044-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the only exposed entry point into the ApplicationMailbox's configured routing system is to call `route`, which performs a lot of work to fully `process` inbound email. It'd be nice to have a way (e.g. in test) of checking which mailbox an email would route to without necessarily processing it yet.
* | | | | | | | | | | | fixes configuration examples [ci skip]Xavier Noria2019-05-091-3/+3
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #36225 from ↵Yuji Yaginuma2019-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deivid-rodriguez/workaround_sass_rails_requirement Use a better requirement for sass-rails 6 prereleases
| * | | | | | | | | | | Use a better requirement for sass-rails 6 prereleasesDavid Rodríguez2019-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the behavior I naively expect for the operator when used with a single digit, but it's definitely an edge case for it, and it doesn't seem to work as expected for including prereleases. Using >= works fine and make the intention more clear anyways.
* | | | | | | | | | | | Merge pull request #36223 from sharang-d/revert-36214Ryuta Kamizono2019-05-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Fix indentation of the config.eager_load nil warning
| * | | | | | | | | | | 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 version
| * | | | | | | | | | | bundle update resque-scheduler to latest versionutilum2019-05-081-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resque 2.0 includes grammar fixes for warnings tickled by our tests. Updating resque-scheduler also requires and updates resque to version 2.0. ``` $ ruby -v ruby 2.6.2p47 (2019-03-13 revision 67232) [x86_64-linux] ```
* | | | | | | | | | | | Merge pull request #36221 from jhawthorn/middleware_instrumentationRafael França2019-05-083-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | Only build middleware proxy when instrumentating
| * | | | | | | | | | | Only build middleware proxy when instrumentatingJohn Hawthorn2019-05-083-6/+17
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The instrumentation proxy adds three stack frames per-middleware, even when nothing is listening. This commit, when the middleware stack is built, only adds instrumentation when the `process_middleware.action_dispatch` event has already been subscribed to. The advantage to this is that we don't have any extra stack frames in apps which don't need middleware instrumentation. The disadvantage is that the subscriptions need to be in place when the middleware stack is built (during app boot). I think this is likely okay because temporary AS::Notifications subscriptions are strongly discouraged.
* | | | | | | | | | | 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 message
| * | | | | | | | | | | 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 #36047 [ci skip]
| * | | | | | | | | | Update testing guide to reflect changes from #36047Richard Macklin2019-05-081-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #36047 we moved `take_failed_screenshot` from an `after_teardown` hook to a `before_teardown` hook. However, I didn't realize the Testing rails guide was explicitly mentioning that it happened inside `after_teardown`. So this updates the docs to be consistent with that change. [ci skip]
* | | | | | | | | | Auto-correct `Style/RedundantBegin` offenceRyuta Kamizono2019-05-081-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This offenced code is introduced from forward ported #36196, since looks like 6-0-stable branch isn't checked by CodeClimate.
* | | | | | | | | | Fix broken markup in CHANGELOG [ci skip]Ryuta Kamizono2019-05-081-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/blob/65bdd6ad085a02b976cd36f135c2a5ffb522e5a0/activesupport/CHANGELOG.md
* | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide malformed parameters from error page Accidentally merged this to 6-0-stable so forward porting it to master here instead.
* | | | | | | | | Merge pull request #36203 from st0012/fix-command-in-contributing-guideRyuta Kamizono2019-05-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update directory name in example commands [ci skip]
| * | | | | | | | | Update directory name in sample commandsst00122019-05-081-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Typo in the release noteAkira Matsuda2019-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #36202 from yahonda/log_transactionRyuta Kamizono2019-05-086-23/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Remove ignored_sql from SQLCounter by adding "TRANSACTION" to log name
| * | | | | | | | Remove ignored_sql from SQLCounter by adding "TRANSACTION" to log nameYasuo Honda2019-05-086-23/+15
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds "TRANSACTION" to savepoint and commit, rollback statements because none of savepoint statements were removed by #36153 since they are not "SCHEMA" statements. Although, only savepoint statements can be labeled as "TRANSACTION" I think all of transaction related method should add this label. Follow up #36153
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 01:22:08 +0000