aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #35585 from sharang-d/changelog-updateRafael França2019-03-121-4/+3
|\ \ \ \ \ \
| * | | | | | Edit a changelog entry [ci skip]Sharang Dashputre2019-03-121-4/+3
* | | | | | | Merge pull request #35583 from cpruitt/add-addititonal-tests-for-dummy-erbEileen M. Uchitelle2019-03-121-0/+54
|\ \ \ \ \ \ \
| * | | | | | | Add additional ERB DummyCompiler testsCliff Pruitt2019-03-121-0/+54
| |/ / / / / /
* | | | | | | Merge pull request #35577 from sharang-d/typo-opt-outVipul A M2019-03-123-13/+13
|\ \ \ \ \ \ \
| * | | | | | | Change wording of some instances of 'opt out' [ci skip]Sharang Dashputre2019-03-123-13/+13
* | | | | | | | Merge pull request #35586 from KurtRMueller/masterRyuta Kamizono2019-03-131-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Update small typo in documentation.Kurt Mueller2019-03-121-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #35581 from prathamesh-sonpatki/action_mailbox_errorKasper Timm Hansen2019-03-122-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Show friendly message to install action mailbox if the related table does not...Prathamesh Sonpatki2019-03-122-0/+5
* | | | | | | | Merge pull request #35582 from vipulnsward/kill-warning-from-guidesKasper Timm Hansen2019-03-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | After https://github.com/rails/rails/pull/35281 and https://github.com/rails...Vipul A M2019-03-121-1/+1
* | | | | | | | | Merge pull request #35530 from Rodrigora/patch-1Vipul A M2019-03-121-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add note about has_many associations callbacks [ci skip]Rodrigo2019-03-121-0/+11
* | | | | | | | | Merge pull request #35575 from sharang-d/changelog-for-parameterizeRyuta Kamizono2019-03-121-1/+13
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add changelog entry for transliterate/parameterize accepting `locale` [ci skip]Sharang Dashputre2019-03-121-0/+10
* | | | | | | | | Merge pull request #35424 from Korri/validation-rules-locale-fallbackRafael França2019-03-113-11/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Changelog with new locale fallback behavior on validationHugo Vacher2019-03-111-0/+24
| * | | | | | | | | Fall back to parent locale before it falls back to the :errors namespaceHugo Vacher2019-03-042-11/+32
* | | | | | | | | | bump Zeitwerk to 1.3.3Xavier Noria2019-03-112-4/+4
* | | | | | | | | | Merge pull request #35576 from sharang-d/fix-typo-overridenVipul A M2019-03-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | overriden -> overridden [ci skip]Sharang Dashputre2019-03-121-1/+1
|/ / / / / / / / /
* | | | | | | | | Do not generate dummy string when the tag used is not the <%=Rafael Mendonça França2019-03-112-1/+5
* | | | | | | | | 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
|/ / / / / / / / / / / /