aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / / /
* | | | [ci skip] Fix more quotes in direct/resolve docsAndrew White2017-02-231-3/+3
| | | | | | | | | | | | | | | | Also correct use of `direct class:` to `resolve` in example.
* | | | Merge pull request #23553 from ↵Rafael França2017-02-2210-5/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/correctly_dump_native_timestamp_types_for_mysql Correctly dump native timestamp types for MySQL
| * | | | Correctly dump native timestamp types for MySQLRyuta Kamizono2017-02-2310-5/+80
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native timestamp type in MySQL is different from datetime type. Internal representation of the timestamp type is UNIX time, This means that timestamp columns are affected by time zone. ``` > SET time_zone = '+00:00'; Query OK, 0 rows affected (0.00 sec) > INSERT INTO time_with_zone(ts,dt) VALUES (NOW(),NOW()); Query OK, 1 row affected (0.02 sec) > SELECT * FROM time_with_zone; +---------------------+---------------------+ | ts | dt | +---------------------+---------------------+ | 2016-02-07 22:11:44 | 2016-02-07 22:11:44 | +---------------------+---------------------+ 1 row in set (0.00 sec) > SET time_zone = '-08:00'; Query OK, 0 rows affected (0.00 sec) > SELECT * FROM time_with_zone; +---------------------+---------------------+ | ts | dt | +---------------------+---------------------+ | 2016-02-07 14:11:44 | 2016-02-07 22:11:44 | +---------------------+---------------------+ 1 row in set (0.00 sec) ```
* | | | Merge pull request #28114 from matthewd/deprecated-evented-redisMatthew Draper2017-02-232-1/+9
|\ \ \ \ | | | | | | | | | | Deprecate the EventedRedis subscription adapter
| * | | | Deprecate the EventedRedis subscription adapterMatthew Draper2017-02-232-1/+9
|/ / / / | | | | | | | | | | | | | | | | Unlike Faye support, it seems a bit too documented to remove without warning. So, here's a warning.
* | | | Clarify use of params in `direct`Andrew White2017-02-222-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since a `direct` url helper block is evaluated using `instance_exec` then methods that are available in the instance context can be accessed, e.g. the params object in a controller action or view. This wasn't clear from the example so expand on that point and add a test case for this situation.
* | | | Merge pull request #28098 from rails/rails-ujs-intergrationRafael França2017-02-2213-70/+407
|\ \ \ \ | |_|/ / |/| | | Better integrate rails-ujs in our repository
| * | | Test rails-ujs in our travis matrixRafael Mendonça França2017-02-2211-70/+338
| | | |
| * | | Move rails-ujs README and LICENCE to actionviewRafael Mendonça França2017-02-222-0/+69
|/ / / | | | | | | | | | We are going to make rails/rails the official repository