aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #35572 from sharang-d/tests-for-transliterate-locale-argKasper Timm Hansen2019-03-114-1/+19
|\
| * Fix bug with parametrize when `locale` is passedSharang Dashputre2019-03-124-1/+19
* | Merge pull request #34955 from bogdanvlviv/follow-up-33962Kasper Timm Hansen2019-03-113-3/+9
|\ \
| * | Add `config.credentials.content_path` and `config.credentials.key_path` to th...bogdanvlviv2019-01-173-5/+10
* | | [ci skip] Improve `encrypted` commands USAGEKasper Timm Hansen2019-03-111-13/+19
* | | Merge pull request #34965 from bogdanvlviv/improve-rails-encrypted--helpKasper Timm Hansen2019-03-112-0/+23
|\ \ \ | |_|/ |/| |
| * | Improve output of `rails encrypted(:edit/:show) --help`bogdanvlviv2019-01-172-0/+23
* | | Merge pull request #35571 from KaanOzkan/ko-parameterize-localeRafael França2019-03-112-10/+14
|\ \ \
| * | | Add locale option to parameterizeKaan Ozkan2019-03-112-10/+14
* | | | Merge pull request #35485 from excid3/default-attachable-trix-partialJavan Makhmali2019-03-115-2/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Adds default trix partialChris Oliver2019-03-055-2/+31
* | | | Merge pull request #35570 from shailesh-kalamkar/fix-routing-expanded-option-...Ryuta Kamizono2019-03-111-4/+4
|\ \ \ \
| * | | | [ci skip] Removed extra hyphensShailesh Kalamkar2019-03-111-4/+4
* | | | | Merge pull request #35568 from prathamesh-sonpatki/server_squishRyuta Kamizono2019-03-116-8/+8
|\ \ \ \ \
| * | | | | Squish the deprecation messages across the codebasePrathamesh Sonpatki2019-03-116-8/+8
| |/ / / /
* | | | | Merge pull request #35569 from prathamesh-sonpatki/env-varsKasper Timm Hansen2019-03-112-4/+4
|\ \ \ \ \
| * | | | | Mention `environment variable` instead of just `environment`Prathamesh Sonpatki2019-03-112-4/+4
| |/ / / /
* | | | | Merge pull request #35566 from prathamesh-sonpatki/server-uKasper Timm Hansen2019-03-111-1/+1
|\ \ \ \ \
| * | | | | Use the -u switch for the `rails server` bannerPrathamesh Sonpatki2019-03-111-1/+1
| |/ / / /
* / / / / Fix style issues and build source after #35525Kasper Timm Hansen2019-03-112-4/+5
|/ / / /
* | | | Merge pull request #35525 from audiolion/feature/dynamic-actioncable-websocke...Kasper Timm Hansen2019-03-112-3/+13
|\ \ \ \
| * | | | address pr feedbackRyan Castner2019-03-091-6/+2
| * | | | feat(js): Dynamic Actioncable WebSocket URLRyan Castner2019-03-072-3/+17
* | | | | Merge pull request #35565 from yahonda/rm_test_create_table_with_custom_seque...Kasper Timm Hansen2019-03-111-33/+0
|\ \ \ \ \
| * | | | | Remove `MigrationTest#test_create_table_with_custom_sequence_name`Yasuo Honda2019-03-111-33/+0
| |/ / / /
* | | | | Merge pull request #35564 from prathamesh-sonpatki/expanded-routes-guideKasper Timm Hansen2019-03-111-1/+28
|\ \ \ \ \
| * | | | | Add example of the output of `rails routes --expanded` in the routing guide [...Prathamesh Sonpatki2019-03-111-1/+28
|/ / / / /
* | | | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2019-03-111-5/+6
* | | | | Merge pull request #35320 from kamille-gz/fix_query_method_when_given_Date_da...Ryuta Kamizono2019-03-113-2/+78
|\ \ \ \ \
| * | | | | Fix query attribute method on user-defined attribute to be aware of typecaste...kamille-3212019-03-113-2/+78
|/ / / / /
* | | | | Merge pull request #35449 from pjrebsch/quoting-empty-rangeRyuta Kamizono2019-03-113-2/+20
|\ \ \ \ \
| * | | | | Quote empty ranges like other empty enumerablesPatrick Rebsch2019-03-073-2/+20
| |/ / / /
* | | | | Merge pull request #35121 from utilum/warning_tried_to_create_proc_without_blockKasper Timm Hansen2019-03-109-18/+18
|\ \ \ \ \
| * | | | | ActionPack Proc.new without a blockutilum2019-02-132-4/+4
| * | | | | Ruby 2.7 warning: creating a Proc without a blockutilum2019-02-137-14/+14
* | | | | | Merge pull request #35549 from r7kamura/feature/response-charsetRyuta Kamizono2019-03-102-4/+37
|\ \ \ \ \ \
| * | | | | | Support other optional parameters and quoted-strings on Content-Type parserr7kamura2019-03-102-4/+37
* | | | | | | Merge pull request #35559 from ashishprajapati/ashishprajapati/important_text...Kasper Timm Hansen2019-03-098-1/+14
|\ \ \ \ \ \ \
| * | | | | | | Added missing guide links in README documentation and minor wording fix [ci s...ashishprajapati2019-03-108-1/+14
* | | | | | | | PostgreSQL: Add `add_pg_encoders` and `add_pg_decoders` in `connect`Ryuta Kamizono2019-03-101-0/+2
* | | | | | | | Don't test `disconnect!` if in memory dbRyuta Kamizono2019-03-101-8/+8
* | | | | | | | Merge pull request #35557 from sharang-d/revert-jquery-changeXavier Noria2019-03-091-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert an incorrect change in jquery-2.2.0.jsSharang Dashputre2019-03-101-2/+2
|/ / / / / / / /
* | | | | | | | SQLite3: Set `busy_timeout` in `configure_connection`Ryuta Kamizono2019-03-101-2/+2
* | | | | | | | Fix `reconnect!` to work after `disconnect!`Ryuta Kamizono2019-03-103-11/+25
* | | | | | | | Merge pull request #35555 from shailesh-kalamkar/fix-autosave-association-tes...Ryuta Kamizono2019-03-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed autosave association test typoShailesh Kalamkar2019-03-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #35552 from abhaynikam/fix-remaining-set-of-links-in-gemspecRyuta Kamizono2019-03-1019-33/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix links in gemspec and docs from http to https.Abhay Nikam2019-03-0919-33/+33
* | | | | | | | | Merge pull request #35553 from sharang-d/update-upsert_all-docRyuta Kamizono2019-03-091-3/+2
|\ \ \ \ \ \ \ \ \