aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add missing gzip footer check in ActiveSupport::Gzip.decompressDylan Thacker-Smith2017-02-244-2/+16
| | | | | | | | A gzip file has a checksum and length for the decompressed data in its footer which isn't checked by just calling Zlib::GzipReader#read. Calling Zlib::GzipReader#close must be called after reading to the end of the file causes this check to be done, which is done by Zlib::GzipReader.wrap after its block is called.
* Merge pull request #28144 from lucasmazza/lm-system-test-driven-byEileen M. Uchitelle2017-02-244-27/+35
|\ | | | | Change `SystemTestCase.driven_by` to use `setup`/`teardown` hooks
| * Change `SystemTestCase.driven_by` to use `setup`/`teardown` hooksLucas Mazza2017-02-244-27/+35
| | | | | | | | | | | | Previously, `driven_by` would change the Capybara configuration when the test case is loaded, and having multiple test classes with different `driven_by` configs would fail as the last loaded would be effective.
* | Merge pull request #28150 from ↵Rafael França2017-02-242-0/+10
|\ \ | | | | | | | | | | | | y-yagi/do_not_display_hidden_namespaces_in_generators_help does not show hidden namespaces in generator's help
| * | does not show hidden namespaces in generator's helpyuuji.yaginuma2017-02-242-0/+10
| | |
* | | Merge pull request #28062 from ↵Rafael França2017-02-242-1/+16
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/make_adding_gemfile_entry_work_even_if_specify_only_the_plugin_name Make adding gemfile entry work even if specify only the plugin name
| * | | Make adding gemfile entry work even if specify only the plugin nameyuuji.yaginuma2017-02-242-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whether the command was executed within the rails application is checked by whether or not the application's path matches `app_path`. https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/generators/rails/plugin/plugin_generator.rb#L439..L441 Therefore, if only plugin name is specified in `app_path`, addition to Gemfile is not done. However, in the rails guide an example of specifying only plugin name is given, and it is considered that there are many cases where only plugin name is specified. For that reason, made it work even if only plugin name was specified.
* | | | Merge pull request #28145 from treiff/update-docs-ActiveRecord__ResultRafael França2017-02-241-1/+12
|\ \ \ \ | |_|/ / |/| | | Improve docs for ActiveRecord::Result. [ci skip]
| * | | Improve docs for ActiveRecord::Result. [ci skip]Trevor Reiff2017-02-241-1/+12
| | |/ | |/| | | | | | | Remove styling from `true` and `false`.
* | | Merge pull request #28141 from y-yagi/show_correct_help_and_versionRafael França2017-02-233-2/+49
|\ \ \ | | | | | | | | Make version and help short-cut alias to work
| * | | Make help short-cut alias to workyuuji.yaginuma2017-02-242-1/+24
| | | |
| * | | Make version short-cut alias to workyuuji.yaginuma2017-02-242-1/+25
| | | |
* | | | Merge pull request #27769 from maclover7/jm-jruby-amoRafael França2017-02-231-1/+1
|\ \ \ \ | | | | | | | | | | Enable Active Model testing for JRuby
| * | | | Enable Active Model testing for JRubyJon Moss2017-02-231-1/+1
| | | | |
* | | | | Merge pull request #28138 from rwz/rwz/hwia-compactRichard Schneeman2017-02-232-1/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | Make HWIA#compact not return nil when no nils
| * | | | Make HWIA#compact not return nil when no nilsPavel Pravosud2017-02-232-1/+11
| |/ / /
* | | | Make security policy more prominent in docsJon Moss2017-02-232-0/+7
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #25285 from ↵Rafael França2017-02-232-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/fix_remove_reference_to_multiple_foreign_keys_in_the_same_table Fix `remove_reference` to multiple foreign keys in the same table
| * | | | Fix `remove_reference` to multiple foreign keys in the same tableRyuta Kamizono2017-02-112-0/+17
| | | | |
* | | | | Merge pull request #27962 from kamipo/deprecate_quoted_idRafael França2017-02-237-60/+111
|\ \ \ \ \ | |_|/ / / |/| | | | Deprecate using `#quoted_id` in quoting / type casting
| * | | | Deprecate using `#quoted_id` in quotingRyuta Kamizono2017-02-245-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Originally `quoted_id` was used in legacy quoting mechanism. Now we use type casting mechanism for that. Let's deprecate `quoted_id`.
| * | | | Fix type casting AR object to respect the primary key cast type's serializationRyuta Kamizono2017-02-242-2/+40
| | | | |
| * | | | Extract `TypeCastingTest` into `test/cases/quoting_test.rb`Ryuta Kamizono2017-02-243-52/+56
| | | | |
* | | | | Merge pull request #28022 from spk/guides-validationRafael França2017-02-231-4/+5
|\ \ \ \ \ | |/ / / / |/| | | | Fix w3c_validator.rb validation script
| * | | | Fix w3c_validator.rb validation scriptLaurent Arnoud2017-02-231-4/+5
| | |/ / | |/| |
* | | | Merge pull request #26559 from kamipo/fix_wait_timeout_as_stringRafael França2017-02-233-2/+25
|\ \ \ \ | | | | | | | | | | Fix `wait_timeout` to configurable for mysql2 adapter
| * | | | Fix `wait_timeout` to configurable for mysql2 adapterRyuta Kamizono2017-02-243-2/+25
| |/ / / | | | | | | | | | | | | Fixes #26556.
* | | | Merge pull request #28112 from bolek/include-job_id-in-all-active-job-logsRafael França2017-02-232-8/+8
|\ \ \ \ | |/ / / |/| | | Include JobID in all ActiveJob info logs
| * | | Include JobID in all ActiveJob info logsBolek Kurowski2017-02-222-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we provide the Job ID in logs only related to enqueuing a job. This adds the job id to the remaining ActiveJob logs when: - a job started performing - a job ended performing Providing the job id in those logs will ease searching logs by job id.
* | | | Rearrange npm release process againMatthew Draper2017-02-231-42/+41
| | | | | | | | | | | | | | | | Make prep_release idempotent, including the npm bump.
* | | | Add a task to build a draft of the release announcementMatthew Draper2017-02-231-0/+69
| | | |
* | | | Do not override the global variableRafael Mendonça França2017-02-231-2/+2
| | | | | | | | | | | | | | | | This will make the version of the next gems to change
* | | | Update package.jsonRafael Mendonça França2017-02-232-2/+2
| | | |
* | | | Preparing for 5.1.0.beta1 releaseRafael Mendonça França2017-02-2322-44/+66
| | | |
* | | | Fix Rakefile loading generator relativelyRafael Mendonça França2017-02-231-1/+1
| | | |
* | | | Move documentation to the correct placeeileencodes2017-02-231-72/+72
| | | | | | | | | | | | | | | | | | | | The documentation needs to be above the method to correctly document the method.
* | | | Use double quotes in the generated plugin test script.Kasper Timm Hansen2017-02-231-3/+3
| | | |
* | | | Merge pull request #28105 from y-yagi/add_wrapper_for_plugins_test_runnerKasper Timm Hansen2017-02-232-7/+8
|\ \ \ \ | | | | | | | | | | Add wrapper for plugin's test runner
| * | | | Add wrapper for plugin's test runneryuuji.yaginuma2017-02-222-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, private API is directly used in `bin/test`. It is necessary to change `bin/test` when changing private API. To avoid this, provide a wrapper file and modify `bin/test` to just require that file.
* | | | | Merge pull request #28131 from rails/chancancode-patch-1Andrew White2017-02-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | 🙈 :nodoc: `AS::Duration::ISO8601Serializer`
| * | | | | 🙈 :nodoc: `AS::Duration::ISO8601Serializer`Godfrey Chan2017-02-231-1/+1
|/ / / / / | | | | | | | | | | This class should not be used directly, the public API is `AS::Duration#iso8601`.
* | | | | Merge pull request #28128 from rails/revert-28127-revert-28038-encrypted-secretsKasper Timm Hansen2017-02-2318-39/+485
|\ \ \ \ \ | | | | | | | | | | | | Revert "Revert "Add encrypted secrets""
| * | | | | Yank the intricate immediately-exiting editor recognition.Kasper Timm Hansen2017-02-231-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most editors support a wait flag of some kind which prevents their process from exiting until the file or window is closed. Prefer people to assign that themselves than us mucking around with File mtimes or other such things. Example of an editor config: ``` export EDITOR="atom --wait" ```
| * | | | | Add back tests for test:units and test:functionals.Kasper Timm Hansen2017-02-231-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Would have caught that the invoke changes broke rake delegation behavior. And we do ship the behavior so we should test it.
| * | | | | Fix test:units not hitting rake task.Kasper Timm Hansen2017-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By splitting the namespace test:units on :, we'd find our TestCommand, which knew nothing of a units method. So check that a found command also includes the command name we're trying to call.
| * | | | | Revert "Revert "Add encrypted secrets""Kasper Timm Hansen2017-02-2317-27/+482
|/ / / / /
* | | | | Merge pull request #28125 from y-yagi/do_not_take_screenshots_when_test_skippedEileen M. Uchitelle2017-02-232-2/+16
|\ \ \ \ \ | | | | | | | | | | | | Do not take screenshot when test skipped
| * | | | | Do not take screenshot when test skippedyuuji.yaginuma2017-02-232-2/+16
| | | | | |
* | | | | | Revert "Add encrypted secrets" (#28127)David Heinemeier Hansson2017-02-2317-482/+27
| | | | | |
* | | | | | Add encrypted secrets (#28038)Kasper Timm Hansen2017-02-2317-27/+482
|/ / / / /